ecrire 0.28.3 → 0.29.0

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

@@ -1,116 +1,105 @@
-#TitlesIndex, #TitlesCreate {
-
-  & > section {
-
-    h3 {
-      margin: 1em 0 0 0;
-    }
-
-    form {
-      @include display(flex);
-      @include align-items(flex-start);
-      width: 100%;
-      max-width: 500px;
-      margin: 5em auto 0 auto;
-      div.fieldset {
-        @include display(flex);
-        width: 100%;
-      }
-
-      & ~ p {
-        max-width: 500px;
-        width: 100%;
-        margin: 0.3em 0 3em 0;
-        font-size: 0.8em;
-      }
+#TitlesIndex > section.titles, #TitlesCreate > section.titles, #Popup.titles {
+  h3 {
+    text-align: center;
+    margin: 1em 0 0 0;
+  }
 
-      div.fieldset {
-        @include flex-direction(column);
-        margin: 0 1em 0 0;
-      }
+  form {
+    @include display(flex);
+    @include align-items(flex-start);
+    width: 100%;
+    max-width: 500px;
+    margin: 1em auto 0 auto;
+    padding: 0 20px;
+  }
 
-      input {
-        @include flex(1);
-        border: 1px solid lighten($gray-blue, 25%);
-        font-family: inherit;
-        font-size: inherit;
-      }
+  form div.fieldset {
+    @include flex-direction(column);
+    @include display(flex);
+    width: 100%;
+    margin: 0 1em 0 0;
+  }
 
-      button {
-        @include transition(box-shadow 0.2s);
-        @include flex(0 0 auto);
-        margin: 2px 0 0 0;
-        text-transform: uppercase;
-        font-size: 0.8em;
-        font-weight: bold;
-        padding: 4px 8px;
-        border-radius: 2px;
-        color: lighten($green, 35%);
-        text-shadow: 0 -1px darken($green, 10%);
-        text-decoration: none;
-        background-color: darken($green, 5%);
-        box-shadow: inset 0 1px 1px 0 lighten($green, 15%);
-
-        &:hover {
-          box-shadow: inset 0 0 0 0 lighten($green, 15%), 0 1px 1px darken($green, 25%);
-        }
-
-        &:active {
-          box-shadow: none;
-        }
+  form ~ p {
+    max-width: 500px;
+    width: 100%;
+    margin: 0.3em 0 3em 0;
+    font-size: 0.8em;
+  }
 
-      }
+  form input {
+    @include flex(1);
+    border: 1px solid $gray-blue;
+    font-family: inherit;
+    font-size: inherit;
+  }
 
+  form button {
+    @include transition(box-shadow 0.2s);
+    @include flex(0 0 auto);
+    margin: 2px 0 0 0;
+    text-transform: uppercase;
+    font-size: 0.8em;
+    font-weight: bold;
+    padding: 4px 8px;
+    border-radius: 2px;
+    color: lighten($green, 35%);
+    text-shadow: 0 -1px darken($green, 10%);
+    text-decoration: none;
+    background-color: darken($green, 5%);
+
+    &:active {
+      box-shadow: inset 0 0 1px 0 darken($green, 25%);
     }
   }
-}
 
-#TitlesIndex > section > ul.titles, #TitlesCreate > section ul.titles {
-  width: 100%;
-  max-width: 500px;
+  ul.titles {
+    width: 100%;
+    max-width: 500px;
+    padding: 0 20px;
+    margin: 1em auto 0 auto;
+  }
 
-  h3 {
+  ul.titles h3 {
     @include justify-content(center);
   }
 
-}
+  ul.titles li {
+    @include flex-direction(column);
+    @include align-items(flex-start);
+    padding: 0.5em 0;
+
+    &:first-child {
+      position: relative;
 
-#TitlesIndex > section > ul.titles li, #TitlesCreate > section ul.titles li {
-  @include flex-direction(column);
-  @include align-items(flex-start);
-  padding: 0.5em 0;
-
-  &:first-child {
-    position: relative;
-
-    &:before {
-      content: "Current";
-      position: absolute;
-      text-transform: uppercase;
-      right: calc(100% + 1em);
-      top: 1em;
-      font-size: 0.7em;
-      font-weight: normal;
-      color: lighten($gray-blue, 20%);
+      &:before {
+        content: "Current";
+        position: absolute;
+        text-transform: uppercase;
+        right: calc(100% + 1em);
+        top: 1.1em;
+        font-size: 0.7em;
+        font-weight: normal;
+        color: $gray-blue;
+      }
     }
   }
 
-  p {
+  ul.titles li p {
     margin: 0;
   }
-  a {
+
+  ul.titles li a {
     font-size: 0.7em;
     font-weight: lighter;
   }
-}
 
-#TitlesIndex > section div.fieldset.errors, #TitlesCreate > section div.fieldset.errors {
-  input {
+  div.fieldset.errors input {
     border: 1px solid darken($red, 5%);
     border-radius: 2px 2px 0 0;
   }
 
-  input + ul.errors {
+  div.fieldset.errors input + ul.errors {
     font-size: 0.8em;
     margin: 0;
     padding: 0 1em;
@@ -124,9 +113,10 @@
 
     color: darken($red, 50%);
     text-shadow: 0 1px lighten($red, 5%);
+  }
 
-    li {
+  div.fieldset.errors input + ul.errors li {
       @include justify-content(center);
-    }
   }
 }
+

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

@@ -1,4 +1,4 @@
-div.overlay {
+[as='Overlay'] {
   @include display(flex);
   @include justify-content(center);
   @include align-items(center);
@@ -15,7 +15,7 @@ main.overlayed {
   position: fixed;
 }
 
-div.popup {
+[as='Popup'] {
   @include display(flex);
   @include flex-direction(column);
   border-radius: 2px;
@@ -33,7 +33,7 @@ div.popup {
   }
 }
 
-div.popup header {
+[as='Popup'] header {
   @include flex(0 0 auto);
   @include display(flex);
   @include align-items(center);
@@ -50,7 +50,7 @@ div.popup header {
   }
 }
 
-div.popup.errors {
+[as='Popup'].errors {
   background: rgb(200, 158, 158);
 
   header {
@@ -64,19 +64,3 @@ div.popup.errors {
     margin: 1em;
   }
 }
-
-#PostsListPopup {
-  ol {
-    list-style-type: none;
-    font-size: 1.2em;
-    padding: 0;
-    li {
-      margin: 1.2em 1em;
-      padding: 0;
-    }
-  }
-
-  div.empty {
-    text-align: center;
-  }
-}

data/lib/ecrire/app/assets/stylesheets/vendor/prism.scss

@@ -12,6 +12,7 @@ code, pre {
 	white-space: pre;
 	word-spacing: normal;
   font-size: 1em;
+  white-space: pre-wrap;
 
 	-moz-tab-size: 4;
 	-o-tab-size: 4;

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

@@ -1,14 +1,32 @@
 module Admin
   module Posts
     class TagsController < Admin::ApplicationController
+      before_action :post
 
       def index
-        @post = Admin::Post.find(params[:post_id])
         @tags = Admin::Tag.all
+        if params.has_key?(:q) && !params[:q].blank?
+          @tags = @tags.search_by_name(params[:q])
+        end
+      end
+
+      def create
+        @tag = Tag.search_by_name(tag_params[:name]).first
+        if @tag.nil?
+          @tag = Tag.create(tag_params)
+        end
+
+        if @post.tags.include? @tag
+          @post.tags = @post.tags.where.not(id: @tag.id)
+        else
+          @post.tags << @tag
+        end
+
+        @post.save!
+
       end
 
       def toggle
-        @post = Admin::Post.find(params[:post_id])
         @tag = Admin::Tag.find(params[:tag_id])
         if @post.tags.include? @tag
           @post.tags = @post.tags.where.not(id: @tag.id)
@@ -19,6 +37,16 @@ module Admin
         @post.save!
       end
 
+      protected
+
+      def post
+        @post ||= Admin::Post.find(params[:post_id])
+      end
+
+      def tag_params
+        params.require(:tag).permit(:name)
+      end
+
     end
   end
 end

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

@@ -18,16 +18,21 @@ module Admin
           redirect_to admin_post_titles_path(@title.post) and return
         end
 
-        render 'index'
+        respond_to do |format|
+          format.html { render 'index' }
+          format.js
+        end
       end
 
       def update
+        @post = Admin::Post.find(params[:post_id])
         @title = Admin::Title.find(params[:id])
-        if @title.update(title_params)
-          redirect_to admin_post_titles_path(@title.post) and return
-        end
+        @title.update(title_params)
 
-        render 'index'
+        respond_to do |format|
+          format.html { render 'index' }
+          format.js
+        end
       end
 
       protected

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

@@ -1,6 +1,7 @@
 module Admin
   class PostsController < Admin::ApplicationController
     before_action :fetch_post, only: [:show, :edit, :update]
+    helper_method :search_posts_params
 
     def new
       @post = Admin::Post.new
@@ -9,15 +10,7 @@ module Admin
     def index
       posts = Admin::Post
 
-      if params.has_key?(:q) && !params[:q].blank?
-        @titles = Admin::Title.search_by_name(params[:q])
-        posts = posts.where('id in (?)', @titles.pluck(:post_id).uniq.compact)
-      end
-
-      if params.has_key?(:tid) && !params[:tid].blank?
-        posts = posts.where('? = ANY(posts.tags)', params[:tid])
-      end
-
+      posts = posts.search search_posts_params
       @posts = posts.order('posts.created_at').includes(:titles)
 
       respond_to do |format|
@@ -75,11 +68,18 @@ module Admin
 
     protected
 
+    def search_posts_params
+      params.require(:posts).permit(:title, :tag, :status)
+    rescue ActionController::ParameterMissing
+      {
+        status: 'all'
+      }
+    end
+
     def title_params
       params.require(:post).permit(:title)
     end
 
-
     def post_params
       params.require(:post).permit(:content, :status, :stylesheet, :javascript, :slug)
     end

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

@@ -2,10 +2,14 @@ module Admin
   module PostsHelper
 
     def post_tags(post)
-      tags = post.tags.map do |tag|
-        tag.name.capitalize
+      if post.tags.any?
+        tags = post.tags.map(&:name).join(', ') << '.'
+      else
+        tags = 'No tag yet.'
       end
-      tags.join(', ')
+
+      tags << ' ' << link_to('Change tags', admin_post_tags_path(post), remote: true)
+      content_tag :div, tags.html_safe, class: %w(tags), as: 'Post.Tags'
     end
 
     def edit_content_tag(post)

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

@@ -97,4 +97,24 @@ module ApplicationHelper
     content_tag :main, html_options, &block
   end
 
+  ##
+  # Render a popup tag
+  #
+  def popup_tag(partial = nil, html_options = {}, &block)
+    html_options.reverse_merge!({
+      as: 'Popup',
+      id: 'Popup',
+      class: 'popup',
+      overlay: true
+    })
+
+    if html_options.delete(:overlay) == true
+      content_tag :div, class: %w(overlay), as: 'Overlay' do
+        content_tag :div, partial, html_options, &block
+      end
+    else
+      content_tag :div, partial, html_options, &block
+    end
+  end
+
 end

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

@@ -41,6 +41,10 @@ module ContentTagHelper
       @attributes[:class]
     end
 
+    def [](k)
+      @attributes[k]
+    end
+
     def []=(k,v)
       @attributes[k] = v
     end

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

@@ -7,6 +7,25 @@ module Admin
     before_save :compile!, prepend: true
     before_save :excerptize!
 
+    def self.search(params = {})
+      rel = self
+
+      if params.has_key?(:tag) && !params[:tag].blank?
+        rel = rel.where('? = ANY(posts.tags)', params[:tag])
+      end
+
+      if params.has_key?(:title) && !params[:title].blank?
+        titles = Admin::Title.search_by_name(params[:title])
+        rel = rel.where('id in (?)', titles.pluck(:post_id).uniq.compact)
+      end
+
+      if params.has_key?(:status)
+        rel = rel.status(params[:status])
+      end
+
+      rel
+    end
+
     def publish!(params = {})
       self.assign_attributes(params)
       self.published_at = DateTime.now
@@ -31,6 +50,10 @@ module Admin
       read_attribute(:content) || ""
     end
 
+    def status
+      published? ? 'published' : 'draft'
+    end
+
     private
 
     def compile!

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

@@ -26,7 +26,7 @@ class Post < ActiveRecord::Base
   scope :status, lambda {|status|
     if status.eql?("published")
       where "posts.published_at IS NOT NULL"
-    else
+    elsif status.eql?('drafted')
       where "posts.published_at IS NULL"
     end
   }

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

@@ -25,9 +25,17 @@ class Tag < ActiveRecord::Base
     end
   end
 
+  include PgSearch
   include ActiveModel::Validations
   validates_with Tag::Validator
 
+  pg_search_scope :search_by_name,
+    against: :name,
+    :using => {
+      :tsearch => {:prefix => true}
+    }
+
+
   def ==(other)
     self.class.table_name == other.class.table_name && self.id == other.id
   end

data/lib/ecrire/app/views/admin/posts/_post.html.erb

@@ -0,0 +1,9 @@
+<li>
+  <%= content_tag :h3, link_to(post.title, edit_admin_post_path(post)), class: %w(title) %>
+  <%= content_tag :span, class: %w(status) do %>
+    <%= content_tag :span, post.status.capitalize, class: %W(status #{post.status}) %>
+    <% if post.published? %>
+      <%= content_tag :span, time_ago_in_words(post.published_at).capitalize, class: %w(published date) %>
+    <% end %>
+  <% end %>
+</li>

data/lib/ecrire/app/views/admin/posts/edit.html.erb

@@ -1,74 +1,34 @@
-<%= content_tag :header, as: "Post.Header", href: admin_post_image_path(@post), method: 'POST' do |header| %>
-  <nav class='actions'>
-    <div class='meta'>
-      <button class='button' as='Editor.Save'>
-        Save
-        <template for='Editor.Save'>
-          <%= content_tag :div, as: 'Editor.Save.Dialog', id: 'SavePost', href: admin_post_path(@post), method: 'PUT' do %>
-            <div class='progress'></div>
-            <p class='message'>
-              Saving...
-            </p>
-          <% end %>
-        </template>
-      </button>
+<%= content_for :post_buttons do %>
+  <%= content_tag :button do |button|%>
 
-      <%= link_to 'Edit', edit_admin_post_path(@post), class: %w(selected button) %>
-      <%= link_to 'Preview', admin_post_path(@post), class: %w(button) %>
-      <%= link_to 'Tags', admin_post_tags_path(@post), class: %w(button) %>
-      <%= link_to 'Title', admin_post_titles_path(@post), class: %w(button) %>
-    </div>
+    <% button[:class] << 'button' %>
+    <% button[:as] = 'Editor.Save' %>
 
+    Save & Preview
 
-    <%= content_tag :div, class: %w(publish state), href: admin_post_toggle_path(@post), method: :put, published: @post.published?, as: 'Post.Publish' do %>
-      <label>Published</label>
-      <label>Draft</label>
-    <% end %>
-  </nav>
-  <template for='Post.Header'>
-    <%= render 'admin/posts/header/dropping', css: %w(status dropping hidden) %>
-    <%= render 'admin/posts/header/uploading', css: %w(status uploading hidden) %>
-    <%= render 'admin/posts/header/error', css: %w(status error hidden) %>
-  </template>
-
-  <% if @post.header? %>
-    <% header[:style] = "background-image: url(#{@post.header.url});" %>
-  <% end %>
-  <div class='drop'>
-  </div>
-
-  <div class='title'>
+    <template for='Editor.Save'>
+    <%= content_tag :div do |div| %>
 
-    <%= content_tag :svg,
-      method: 'DELETE',
-      href: admin_post_image_path(@post),
-      class: %w(clear),
-      version: "1.1",
-      xmlns: "http://www.w3.org/2000/svg",
-      'xmlns:xlink' => "http://www.w3.org/1999/xlink",
-      x: "0px",
-      y: "0px",
-      viewBox: "0 0 20 20",
-      'enable-background' => "new 0 0 20 20",
-      'xml:space' => "preserve" do |svg| %>
+      <% div[:as] = 'Editor.Save.Dialog' %>
+      <% div[:id] = 'SavePost' %>
+      <% div[:href] = admin_post_path(@post) %>
+      <% div[:method] = 'PUT' %>
 
-      <% if !@post.header? %>
-        <% svg.css << 'hidden' %>
-      <% end %>
+      <div class='progress'></div>
+      <p class='message'>
+        Saving...
+      </p>
 
-        <path d="M16,2H4C2.9,2,2,2.9,2,4v12c0,1.1,0.9,2,2,2h12c1.1,0,2-0.9,2-2V4C18,2.9,17.1,2,16,2z M13.061,14.789L10,11.729
-    	   l-3.061,3.06l-1.729-1.728L8.271,10L5.211,6.939l1.729-1.729L10,8.271l3.059-3.061l1.729,1.729L11.729,10l3.06,3.061L13.061,14.789z
-    	    "/>
     <% end %>
+    </template>
 
-    <%= link_to @post.title, admin_post_titles_path(@post), class: %w(title) %>
-    <input type='file' />
-    <p class='browse'>Set a header image. Either <strong>drop</strong> an image here or <strong>select an image</strong>.</p>
-  </div>
-
+  <% end %>
 <% end %>
 
-<section>
+<%= render 'admin/posts/header/base', post: @post %>
+
+<section id='PostEditContent'>
+  <%= post_tags(@post) %>
 
   <%= edit_content_tag(@post) do %>
     <%= h @post.content %>

data/lib/ecrire/app/views/admin/posts/header/_base.html.erb

@@ -0,0 +1,54 @@
+<%= content_tag :header, as: "Post.Header", id: 'PostHeader', href: admin_post_image_path(post), method: 'post' do |header| %>
+
+  <nav class='actions'>
+    <%= content_tag :div, yield(:post_buttons), class: %w(buttons) %>
+
+    <%= content_tag :div, class: %w(publish state), href: admin_post_toggle_path(@post), method: :put, published: @post.published?, as: 'Post.Publish' do %>
+      <label>Published</label>
+      <label>Draft</label>
+    <% end %>
+  </nav>
+
+  <template for='Post.Header'>
+    <%= render 'admin/posts/header/dropping', css: %w(status dropping hidden) %>
+    <%= render 'admin/posts/header/uploading', css: %w(status uploading hidden) %>
+    <%= render 'admin/posts/header/error', css: %w(status error hidden) %>
+  </template>
+
+  <% if @post.header? %>
+    <% header[:style] = "background-image: url(#{@post.header.url});" %>
+  <% end %>
+  <div class='drop'>
+  </div>
+
+  <div class='title'>
+
+    <%= content_tag :svg,
+      method: 'DELETE',
+      href: admin_post_image_path(@post),
+      class: %w(clear),
+      version: "1.1",
+      xmlns: "http://www.w3.org/2000/svg",
+      'xmlns:xlink' => "http://www.w3.org/1999/xlink",
+      x: "0px",
+      y: "0px",
+      viewBox: "0 0 20 20",
+      'enable-background' => "new 0 0 20 20",
+      'xml:space' => "preserve" do |svg| %>
+
+      <% if !@post.header? %>
+        <% svg.css << 'hidden' %>
+      <% end %>
+
+        <path d="M16,2H4C2.9,2,2,2.9,2,4v12c0,1.1,0.9,2,2,2h12c1.1,0,2-0.9,2-2V4C18,2.9,17.1,2,16,2z M13.061,14.789L10,11.729
+    	   l-3.061,3.06l-1.729-1.728L8.271,10L5.211,6.939l1.729-1.729L10,8.271l3.059-3.061l1.729,1.729L11.729,10l3.06,3.061L13.061,14.789z
+    	    "/>
+    <% end %>
+
+    <%= link_to @post.title, admin_post_titles_path(@post), class: %w(title), remote: true, as: 'Post.Title' %>
+    <input type='file' />
+    <p class='browse'>Set a header image. Either <strong>drop</strong> an image here or <strong>select an image</strong>.</p>
+  </div>
+
+<% end %>
+