ecrire 0.22.1 → 0.23.0

data/lib/ecrire/app/assets/stylesheets/admin/tags.css.scss

@@ -0,0 +1,78 @@
+#TagsList {
+  @include display(flex);
+  @include align-items(center);
+  margin: 1em 0;
+  min-height: 5em;
+
+  svg {
+    height: 20px;
+    fill: #AAA;
+  }
+
+  ul.tags {
+    @include flex(1 auto);
+    @include display(flex);
+    @include flex-wrap(wrap);
+    @include align-items(center);
+    margin: 0 1em;
+    outline: none;
+
+    [as='Post.Tag'] {
+      @include display(flex);
+      @include flex(0 auto);
+      @include align-items(center);
+      @include transition(color 0.3s, border-color 0.3s, box-shadow 0.3s, opacity 0.2s);
+      @include user-select(none);
+
+      margin: 1em;
+      padding: 4px 8px;
+      border-radius: 2px;
+      border: 1px solid #C7D4DB;
+      box-shadow: inset 0 2px 4px 0 #F5F8FA;
+      cursor: pointer;
+
+      svg {
+        @include transition(fill 0.3s);
+        margin-left: 6px;
+        fill: rgb(219, 196, 196);
+      }
+
+      &:hover svg {
+        fill: #AE4D4D;
+      }
+
+      &:active {
+        border-color: #B37878;
+        box-shadow: inset 0 0px 4px 0 #DBC5C5;
+        color: #B37878;
+      }
+
+      &.remove {
+        opacity: 0;
+      }
+    }
+
+  }
+}
+
+[as='Tags.List'] {
+  h2, h3 {
+    text-align: center;
+  }
+
+  input {
+    font-size: 1.5em;
+  }
+  li {
+    cursor: pointer;
+    margin: 0;
+    padding: 1em;
+    font-size: 1.3em;
+    &:not(:last-child) {
+      border-bottom: 1px solid #C8D9E2;
+    }
+  }
+  li.tagged {
+    border-left: 4px solid #AAA;
+  }
+}

data/lib/ecrire/app/assets/stylesheets/admin/title.css.scss

@@ -0,0 +1,51 @@
+[as='Post.Title'] {
+  h3 {
+    padding: 0.2em;
+    text-align: center;
+  }
+
+  div.input {
+    outline: none;
+    background: #FFF;
+    font-size: 1.6em;
+    line-height: 1em;
+    padding: 0.3em 0.2em;
+    text-align: center;
+    box-shadow: inset 0 0 2px #375874;
+  }
+  & > p {
+    text-align: center;
+    font-size: 0.8em;
+    text-shadow: 0 1px 0 #E7EFF5;
+  }
+
+  ul.titles {
+    border-top: 1px solid #B2BCC3;
+
+    h4 {
+      text-align: center;
+      margin: 0.5em 0 0 0;
+    }
+
+    li {
+      margin: 0;
+      padding: 1em;
+      p.title {
+        font-size: 1.2em;
+        margin: 0;
+      }
+
+      p.url {
+        font-size: 0.8em;
+      }
+    }
+    li:nth-child(odd) {
+      background: #D1DAE0;
+    }
+  }
+
+  ul.errors {
+    text-align: center;
+    color: $red-color;
+  }
+}

data/lib/ecrire/app/assets/stylesheets/admin/variables.css.scss

@@ -1,7 +1,10 @@
 $fonts: Helvetica, sans-serif;
 
 $text-color: #15191B;
+$link-color: rgb(114, 153, 204);
 $shadow-color: #374C64;
+$dark-red-color: #2F0B0B;
+$red-color: rgb(169, 40, 40);
 
 $warning: #F0BC6F;
 $dropping-color: #EDFFED;

data/lib/ecrire/app/assets/stylesheets/shared/popup.css.scss

@@ -26,6 +26,7 @@ div.popup {
   box-shadow: 0 0 3px #1a3642;
   color: #15191B;
   z-index: 101;
+  overflow: hidden;
 
   h1, h2, h3, h4, h5, h6 {
     font-family: initial;
@@ -67,6 +68,7 @@ div.popup.errors {
 
 #PostsListPopup {
   ol {
+    list-style-type: none;
     font-size: 1.2em;
     padding: 0;
     li {

data/lib/ecrire/app/controllers/admin/application_controller.rb

@@ -5,6 +5,12 @@ module Admin
     before_action :authenticate!
     before_action :pagination, only: [:index]
 
+    helper_method :posts
+
+    def posts
+      @posts ||= Post.all
+    end
+
     protected
 
     def pagination

data/lib/ecrire/app/controllers/admin/images_controller.rb

@@ -7,12 +7,11 @@ module Admin
       end
     end
 
-    def update
-      @image = post.header
-      if @image.update(image_params)
-        @image.touch
-      else
-        render 'errors'
+    def create
+      @image = post.header || post.build_header
+
+      unless @image.update(image_params)
+        render 'errors', status: 500
       end
     end
 

data/lib/ecrire/app/controllers/admin/posts/tags_controller.rb

@@ -0,0 +1,35 @@
+module Admin
+  module Posts
+    class TagsController < Admin::ApplicationController
+      def index
+        @post = Admin::Post.find(params[:post_id])
+        @tags = Admin::Tag.where.not(id: @post.tags.map(&:id))
+      end
+
+      def update
+        @post = Admin::Post.find(params[:post_id])
+        @tag = Admin::Tag.find(params[:id])
+        if @post.tags.include? @tag
+          @post.tags = @post.tags.where.not(id: @tag.id)
+        else
+          @post.tags << @tag
+        end
+
+        @post.save!
+      end
+
+      def create
+        @post = Admin::Post.find(params[:post_id])
+        @tag = Admin::Tag.find_or_create_by!(tag_params)
+      end
+
+      protected
+
+      def tag_params
+        params.require(:tag).permit('name')
+      end
+
+
+    end
+  end
+end

data/lib/ecrire/app/controllers/admin/posts_controller.rb

@@ -3,9 +3,7 @@ module Admin
     before_action :fetch_post, only: [:show, :edit, :update]
 
     def new
-      if /new\/title/i =~ request.path
-        render 'title' and return
-      end
+      @post = Admin::Post.new
     end
 
     def index
@@ -18,15 +16,13 @@ module Admin
     end
 
     def create
-      @post = Admin::Post.create post_params
+      @post = Admin::Post.create(title: title_params[:title])
 
-      respond_to do |format|
-        format.html do
-          if @post.errors.blank?
-            redirect_to edit_admin_post_path(@post.id)
-          end
-        end
+      if @post.errors.any?
+        render 'new' and return
       end
+
+      redirect_to edit_admin_post_path(@post)
     end
 
     def destroy
@@ -51,7 +47,7 @@ module Admin
           when 'publish'
             @post.publish!
             flash[:notice] = t(".successful", title: @post.title)
-            redirect_to post_path(@post.published_at.year, @post.published_at.month, @post.slug) and return
+            redirect_to post_path(@post) and return
           when 'unpublish'
             @post.unpublish!
           end
@@ -71,9 +67,14 @@ module Admin
     protected
 
     def post_params
-      params.require(:post).permit(:title, :content, :status, :stylesheet, :javascript, :slug)
+      params.require(:post).permit(:content, :status, :stylesheet, :javascript, :slug)
+    end
+
+    def title_params
+      params.require(:post).permit(:title)
     end
 
+
     def fetch_post
       @post = Admin::Post.find(params[:id])
     end

data/lib/ecrire/app/controllers/admin/tags_controller.rb

@@ -0,0 +1,4 @@
+module Admin
+  class TagsController < Admin::ApplicationController
+  end
+end

data/lib/ecrire/app/controllers/admin/titles_controller.rb

@@ -0,0 +1,39 @@
+module Admin
+  class TitlesController < Admin::ApplicationController
+    helper_method :post
+
+    def index
+      if post.draft?
+        render 'edit' and return
+      end
+    end
+
+    def create
+      @title = Admin::Title.new(title_params) do |title|
+        title.post = post
+      end
+
+      unless @title.save
+        render 'errors'
+      end
+    end
+
+    def update
+      @title = Admin::Title.find(params[:id])
+      unless @title.update(title_params)
+        render 'errors'
+      end
+    end
+
+    protected
+
+    def title_params
+      params.require(:title).permit(:name)
+    end
+
+    def post
+      @post ||= Post.find(params[:post_id])
+    end
+
+  end
+end

data/lib/ecrire/app/controllers/application_controller.rb

@@ -3,7 +3,7 @@ class ApplicationController < ::ActionController::Base
   protect_from_forgery with: :exception
   helper_method :current_user, :signed_in?
 
-  helper_method :warden, :posts
+  helper_method :warden, :post_path
 
   def current_user
     warden.user
@@ -13,10 +13,20 @@ class ApplicationController < ::ActionController::Base
     !warden.user.nil?
   end
 
-  def posts
-    @posts ||= Post.all
+  # This is the less ugly hack I could find. The reason why this is here
+  # is because helpers are hard to debug due to their anonymous Module use.
+  def post_path(post, options = {})
+    options[:controller] = :posts
+    options[:action] = :show
+    options[:year] = post.published_at.year
+    options[:month] = post.published_at.month
+
+    options[:id] = (options.delete(:title) || post.titles.first).slug
+
+    url_for options
   end
 
+
   protected
 
   def authenticate!

data/lib/ecrire/app/controllers/ecrire/posts_controller.rb

@@ -1,13 +1,10 @@
 module Ecrire
   class PostsController < ::ApplicationController
-    # TODO: This should be included. I have no idea why this isn't.
-    # It actually is loaded in dev as soon as the reloader reloads the files
-    include Rails.application.routes.url_helpers
 
     before_action :pagination, only: :index
     protect_from_forgery except: :index
 
-    helper_method :post
+    helper_method :post, :posts
 
     def index
       respond_to do |format|
@@ -22,6 +19,9 @@ module Ecrire
     def show
       redirect_to :root and return if post.nil?
       redirect_to :root and return unless post.published?
+      if post.titles.first != @title
+        redirect_to post_path(post), status: :moved_permanently
+      end
     end
 
     protected
@@ -31,7 +31,8 @@ module Ecrire
     end
 
     def post
-      @post ||= Post.find_by_slug(params[:id])
+      @title ||= Title.find_by_slug(params[:id])
+      @post ||= @title.post
     end
 
     def pagination

data/lib/ecrire/app/helpers/posts_helper.rb

@@ -1,16 +1,4 @@
 module PostsHelper
-  def post_path(post, options = {})
-    if post.published?
-      options[:year] = post.published_at.year
-      options[:month] = post.published_at.month
-    else
-      options[:year] = post.created_at.year
-      options[:month] = post.created_at.month
-    end
-
-    super(post.becomes(::Post), options)
-  end
-
   def edit_post_link(options = {})
     return unless signed_in?
 

data/lib/ecrire/app/models/admin/image.rb

@@ -34,18 +34,15 @@ module Admin
           self.url = @file.url
           self.key = @file.key
         rescue StandardError => e
-          errors.add :remote, e
+          errors.add 's3', "Couldn't upload file to S3"
           return false
         end
         return true
       end
     end
 
-    def remove_file
-    end
-
     def path(file)
-      items = [post.id, file.original_filename]
+      items = [self.post.id, file.original_filename]
 
       items.prepend(s3.path) unless s3.path.blank?
 
@@ -56,7 +53,7 @@ module Admin
       include ::S3
 
       attr_reader :bucket, :access_key, :secret_key, :path, :errors
-      
+
       def initialize(options={})
         @errors = ActiveModel::Errors.new(self)
         @access_key = options.fetch('access_key', "")
@@ -85,7 +82,7 @@ module Admin
           @bucket.retrieve
           @connected = true
         rescue Error::ResponseError, ArgumentError, SocketError => e
-          errors.add :remote, e
+          errors.add :remote, "Couldn't connect to S3."
         end
       end
 

data/lib/ecrire/app/models/admin/post.rb

@@ -3,16 +3,11 @@ require 'kramdown'
 module Admin
   class Post < ::Post
 
-    class Callbacks
-      def after_create(record)
-        Admin::Image.create(post: record)
-      end
-    end
-
     has_one :header, class_name: Admin::Image
+    has_many :titles, -> { order "titles.created_at DESC" }, class_name: Admin::Title
+
     before_save :compile!, prepend: true
     before_save :excerptize!
-    after_create Callbacks.new
 
     def publish!(params = {})
       self.assign_attributes(params)

data/lib/ecrire/app/models/admin/tag.rb

@@ -0,0 +1,4 @@
+module Admin
+  class Tag < ActiveRecord::Base
+  end
+end

data/lib/ecrire/app/models/admin/title.rb

@@ -0,0 +1,4 @@
+module Admin
+  class Title < ::Title
+  end
+end

data/lib/ecrire/app/models/post.rb

@@ -2,6 +2,7 @@ require 'nokogiri'
 
 class Post < ActiveRecord::Base
   has_one :header, class_name: Image
+  has_many :titles, -> { order "titles.created_at DESC" }
 
   store_accessor :properties, :labels
 
@@ -15,13 +16,31 @@ class Post < ActiveRecord::Base
 
   scope :published, lambda { status("published") }
   scope :drafted, lambda { status("drafted") }
-  scope :slug, lambda { |slug| where("posts.slug is ?", slug) }
   scope :without, lambda { |post| where("posts.id != ?", post.id) }
 
-  validates :title, presence: true, uniqueness: true
-  validates :slug, presence: true, uniqueness: true
+  validates :titles, length: {minimum: 1}
 
-  before_validation :create_slug_if_nil
+  before_save :update_tags
+
+  attr_writer :tags
+
+  def title=(new_title)
+    if self.published?
+      self.titles.new(name: new_title)
+    else
+      title = self.titles.first || self.titles.new
+      title.post = self
+      title.name = new_title
+    end
+  end
+
+  def title
+    (self.titles.first || self.titles.new).name
+  end
+
+  def slug
+    self.titles.first.slug
+  end
 
   def status=(new_status)
     if new_status.eql? "publish"
@@ -59,32 +78,21 @@ class Post < ActiveRecord::Base
     (self.compiled_excerpt || "").html_safe
   end
 
-
-  def title=(new_title)
-    super
-    if self.draft?
-      self.slug = nil
-    end
-  end
-
   def header?
     !self.header.nil? && !self.header.url.blank?
   end
 
-  def labels
-    ids = super || ''
-    Label.where(id: ids.split(',')).to_a
-  end
-
-  def labels=(labels)
-    super(labels.map(&:id).join(','))
+  def tags
+    @tags ||= Tag.where("tags.id in (?)", super || [])
   end
 
   protected
 
-  def create_slug_if_nil
-    return unless self.slug.blank?
-    self.slug = self.title.parameterize
+  def update_tags
+    ids = tags.map(&:id)
+    unless ids == read_attribute(:tags)
+      write_attribute(:tags, ids)
+    end
   end
 
 end

data/lib/ecrire/app/models/tag.rb

@@ -0,0 +1,5 @@
+class Tag < ActiveRecord::Base
+  def ==(other)
+    self.class.table_name == other.class.table_name && self.id == other.id
+  end
+end

data/lib/ecrire/app/models/title.rb

@@ -0,0 +1,62 @@
+class Title < ActiveRecord::Base
+  class Validator < ActiveModel::Validator
+    def validate(record)
+      validate_length! record
+      validate_uniqueness! record
+      validate_draft! record
+    end
+
+    def validate_length!(record)
+      if record.name.blank?
+        msg = "Your title can't be blank."
+        record.errors['name'] << msg
+        record.post.errors['title'] << msg
+      elsif record.name.length < 1
+        msg = "Your title needs to be at least 1 character long."
+        record.errors['name'] << msg
+        record.post.errors['title'] << msg
+      end
+    end
+
+    def validate_uniqueness!(record)
+      title = Title.where('titles.slug = ? OR titles.name = ?', record.slug, record.name).first
+      unless title.nil?
+        msg = "You already have a post with this title: #{title.name}"
+        record.errors['uniqueness'] << msg
+        record.post.errors['title'] << msg
+        return
+      end
+    end
+
+    def validate_draft!(record)
+      if record.post.published? && !record.new_record?
+        msg = "You cannot modify an existing title when a post is published"
+        record.errors['draft'] << msg
+        record.post.errors['title'] << msg
+      end
+    end
+
+  end
+
+  include ActiveModel::Validations
+  validates_with Title::Validator
+
+  before_validation :generate_slug
+
+  belongs_to :post, required: true
+
+  scope :slug, lambda { |slug|
+    where('titles.slug = ?', slug)
+  }
+
+  def name=(new_name)
+    super new_name.strip
+  end
+
+  protected
+
+  def generate_slug
+    self.slug = self.name.parameterize.downcase
+  end
+
+end

data/lib/ecrire/app/views/admin/images/errors.json.jbuilder

@@ -0,0 +1 @@
+json.array! @image.errors.values