ecrire 0.22.1 → 0.23.0

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

@@ -1,19 +1,51 @@
-<header>
-  <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" class='toggle', as='Navigation.Toggle' x="0px" y="0px" viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">
-    <path d="M4.516,7.548c0.436-0.446,1.043-0.481,1.576,0L10,11.295l3.908-3.747c0.533-0.481,1.141-0.446,1.574,0  c0.436,0.445,0.408,1.197,0,1.615c-0.406,0.418-4.695,4.502-4.695,4.502C10.57,13.888,10.285,14,10,14s-0.57-0.112-0.789-0.335  c0,0-4.287-4.084-4.695-4.502C4.107,8.745,4.08,7.993,4.516,7.548z"/>
-  </svg>
-
-  <%= form_for @post,
-    as: 'post',
-    remote: true,
-    html: {as: 'Posts.Title', class: %w(post title settings autosave)} do |f| %>
-    <%= hidden_field_tag :context, :title %>
-
-    <%= f.text_field :title, class: %w(title), autocomplete: :off %>
+<%= content_tag :header, as: "Post.Header", href: admin_post_image_path(@post), method: 'POST' do |header| %>
+  <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 %>
-</header>
+  <div class='drop'>
+  </div>
+
+  <div class='title'>
+
+    <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" class='toggle', as='Navigation.Toggle' x="0px" y="0px" viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">
+      <path d="M4.516,7.548c0.436-0.446,1.043-0.481,1.576,0L10,11.295l3.908-3.747c0.533-0.481,1.141-0.446,1.574,0  c0.436,0.445,0.408,1.197,0,1.615c-0.406,0.418-4.695,4.502-4.695,4.502C10.57,13.888,10.285,14,10,14s-0.57-0.112-0.789-0.335  c0,0-4.287-4.084-4.695-4.502C4.107,8.745,4.08,7.993,4.516,7.548z"/>
+    </svg>
+    <%= 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), remote: true, 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 %>
 
-<section as='Post.Documentation'>
+<section>
 
   <%= content_tag :div, class: %w(publish state), href: admin_post_path(@post.id), as: 'Post.Sticky' do %>
 
@@ -41,15 +73,23 @@
   <% end %>
 
   <article>
-    <%= content_tag :header, as: "Post.Header" do |header| %>
-      <% if @post.header? %>
-        <% header[:style] = "background-image: url(#{@post.header.url});" %>
-      <% end %>
 
-      <%= render 'admin/images/form', post: @post %>
-    <% end %>
+    <div id='TagsList'>
+      <svg version="1.1" id="Tag" 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">
+        <path d="M18.662,5.521L5.237,19l0.707-4.967l-4.945,0.709L14.424,1.263c0.391-0.392,1.133-0.308,1.412,0l2.826,2.839 C19.162,4.575,19.053,5.128,18.662,5.521z"/>
+      </svg>
+      <ul class='tags' as='Post.Tags'>
+        <% @post.tags.each do |tag| %>
+          <%= render 'admin/posts/tags/tag', tag: tag, post: @post %>
+        <% end %>
+        <%= link_to "Add tags", admin_post_tags_path(@post), remote: true %>
+      </ul>
+    </div>
 
     <%= post_edit_content(@post) %>
+
+    <template id='EditorElements'>
+      <figure as='Editor.Image'><template for='Editor.Image' contenteditable=false><p class='placeholder'>Drop an image or click here to upload a picture.</p><img><div class='progressbar'><span class='progress'></span></div></template><div contenteditable=false><input type='file' /></div><figcaption></figcaption></figure></template>
   </article>
 
   <div class='save' as='Post.Sticky'>
@@ -61,7 +101,7 @@
       <% end %>
     <% end %>
 
-    <%= link_to 'Syntax', help_admin_posts_path, remote: true, class: %w(help) %>
+    <%= link_to 'Syntax', help_admin_posts_path, remote: true, class: %w(help), as: 'Post.Documentation' %>
 
     <% unless Rails.application.secrets.has_key?(:s3) %>
       <div class='s3 configuration missing'>

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

@@ -0,0 +1,12 @@
+<%= content_tag :div, class: css do %>
+  <svg version="1.1" id="Download" 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">
+    <path d="M15,7h-3V1H8v6H5l5,5L15,7z M19.338,13.532c-0.21-0.224-1.611-1.723-2.011-2.114C17.062,11.159,16.683,11,16.285,11h-1.757
+      l3.064,2.994h-3.544c-0.102,0-0.194,0.052-0.24,0.133L12.992,16H7.008l-0.816-1.873c-0.046-0.081-0.139-0.133-0.24-0.133H2.408
+      L5.471,11H3.715c-0.397,0-0.776,0.159-1.042,0.418c-0.4,0.392-1.801,1.891-2.011,2.114c-0.489,0.521-0.758,0.936-0.63,1.449
+      l0.561,3.074c0.128,0.514,0.691,0.936,1.252,0.936h16.312c0.561,0,1.124-0.422,1.252-0.936l0.561-3.074
+      C20.096,14.468,19.828,14.053,19.338,13.532z"/>
+  </svg>
+
+  <p>Release the image to set it the header for this post.</p>
+<% end %>

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

@@ -0,0 +1,18 @@
+<%= content_tag :div, class: css do %>
+  <svg version="1.1" id="Emoji_sad" 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">
+  <path d="M10.001,0.4C4.698,0.4,0.4,4.698,0.4,10c0,5.303,4.298,9.601,9.601,9.601c5.301,0,9.6-4.298,9.6-9.601
+  	C19.6,4.698,15.301,0.4,10.001,0.4z M10,17.599c-4.197,0-7.6-3.402-7.6-7.6c0-4.197,3.402-7.6,7.6-7.6c4.197,0,7.6,3.402,7.6,7.6
+  	C17.6,14.197,14.197,17.599,10,17.599z M12.501,9.75c0.828,0,1.5-0.783,1.5-1.75s-0.672-1.75-1.5-1.75c-0.828,0-1.5,0.783-1.5,1.75
+  	S11.672,9.75,12.501,9.75z M7.501,9.75c0.828,0,1.5-0.783,1.5-1.75s-0.672-1.75-1.5-1.75c-0.828,0-1.5,0.783-1.5,1.75
+  	S6.672,9.75,7.501,9.75z M10.002,11.25c-3.424,0-4.622,2.315-4.672,2.414c-0.186,0.371-0.035,0.821,0.335,1.007
+  	C5.773,14.724,5.887,14.75,6,14.75c0.275,0,0.54-0.151,0.672-0.414c0.008-0.017,0.822-1.586,3.33-1.586
+  	c2.463,0,3.298,1.527,3.328,1.585c0.184,0.37,0.635,0.523,1.006,0.336c0.371-0.184,0.521-0.636,0.336-1.006
+  	C14.623,13.566,13.426,11.25,10.002,11.25z"/>
+  </svg>
+
+  <ul class='messages'>
+  </ul>
+
+  <button>Dismiss</button>
+<% end %>

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

@@ -0,0 +1,21 @@
+<%= content_tag :div, class: css do %>
+  <svg version="1.1" id="Hour_glass" 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">
+  <path d="M15.6,4.576c0-2.139,0-2.348,0-2.348C15.6,1.439,13.092,0,10,0C6.907,0,4.4,1.439,4.4,2.228c0,0,0,0.209,0,2.348
+  	C4.4,6.717,8.277,8.484,8.277,10c0,1.514-3.877,3.281-3.877,5.422c0,2.141,0,2.35,0,2.35C4.4,18.56,6.907,20,10,20
+  	c3.092,0,5.6-1.44,5.6-2.229c0,0,0-0.209,0-2.35c0-2.141-3.877-3.908-3.877-5.422C11.723,8.484,15.6,6.717,15.6,4.576z M5.941,2.328
+  	c0.696-0.439,2-1.082,4.114-1.082c2.113,0,4.006,1.082,4.006,1.082c0.142,0.086,0.698,0.383,0.317,0.609
+  	C13.54,3.434,11.9,3.957,10,3.957c-1.9,0-3.484-0.576-4.324-1.074C5.295,2.658,5.941,2.328,5.941,2.328z M10.501,10
+  	c0,1.193,0.996,1.961,2.051,2.986c0.771,0.748,1.826,1.773,1.826,2.435v1.328c-0.97-0.483-3.872-0.955-3.872-2.504
+  	c0-0.783-1.013-0.783-1.013,0c0,1.549-2.902,2.021-3.872,2.504v-1.328c0-0.662,1.056-1.688,1.826-2.435
+  	C8.502,11.961,9.498,11.193,9.498,10c0-1.193-0.996-1.961-2.051-2.986c-0.771-0.75-1.826-1.775-1.826-2.438L5.575,3.578
+  	C6.601,4.131,8.227,4.656,10,4.656c1.772,0,3.406-0.525,4.433-1.078l-0.055,0.998c0,0.662-1.056,1.688-1.826,2.438
+  	C11.498,8.039,10.501,8.807,10.501,10z"/>
+  </svg>
+
+  <p>Uploading your new header...</p>
+  
+  <div class='progressbar'>
+    <span class='progress'></span>
+  </div>
+<% end %>

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

@@ -0,0 +1,23 @@
+<%= form_for @post, as: :post, url: admin_posts_path, html: { class: %w(post new title), as: 'Posts.New' } do |f| %>
+
+  <%= content_tag :fieldset, class: %w(transparent) do |fieldset| %>
+    <% if @post.errors.any? %>
+      <% fieldset.css << 'errors' %>
+    <% end %>
+
+    <%= f.text_field :title, placeholder: t('admin.posts.new.title') %>
+  <% end %>
+
+  <% if @post.errors.any? %>
+    <ul class='errors'>
+      <% @post.errors.each do |key, message| %>
+        <%= content_tag :li, message %>
+      <% end %>
+    </ul>
+  <% else %>
+    <%= content_tag :p, t('admin.posts.new.editable'), class: %w(transparent) %>
+  <% end %>
+
+  <%= f.button :submit, class: %w(hidden) %>
+
+<% end %>

data/lib/ecrire/app/views/admin/posts/tags/_tag.html.erb

@@ -0,0 +1,10 @@
+<%= content_tag :li, as: 'Post.Tag', oid: tag.id, href: admin_post_tag_path(@post, tag), method: :put do %>
+  <%= tag.name %>
+  <svg 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">
+  <path d="M14.348,14.849c-0.469,0.469-1.229,0.469-1.697,0L10,11.819l-2.651,3.029c-0.469,0.469-1.229,0.469-1.697,0
+    c-0.469-0.469-0.469-1.229,0-1.697l2.758-3.15L5.651,6.849c-0.469-0.469-0.469-1.228,0-1.697c0.469-0.469,1.228-0.469,1.697,0
+    L10,8.183l2.651-3.031c0.469-0.469,1.228-0.469,1.697,0c0.469,0.469,0.469,1.229,0,1.697l-2.758,3.152l2.758,3.15
+    C14.817,13.62,14.817,14.38,14.348,14.849z"/>
+  </svg>
+<% end %>

data/lib/ecrire/app/views/admin/posts/tags/create.js.erb

@@ -0,0 +1 @@
+e.HTML = "<%= j render('admin/posts/tags/dialog/tag', tag: @tag, post: @post) %>".toHTML()

data/lib/ecrire/app/views/admin/posts/tags/dialog/_tag.html.erb

@@ -0,0 +1,3 @@
+<%= content_tag :li, href: admin_post_tag_path(post, tag), method: :put, oid: tag.id do |li| %>
+  <%= tag.name %>
+<% end %>

data/lib/ecrire/app/views/admin/posts/tags/dialog/_tags.html.erb

@@ -0,0 +1,12 @@
+<div class='overlay' as='Overlay'>
+  <div class='popup' as='Tags.List'>
+    <h2>Tags</h2>
+    <%= text_field_tag :tags, nil, placeholder: 'Create a new tag', href: admin_post_tags_path(@post) %>
+    <h3>Tags you haven't used for this post</h3>
+    <ul>
+      <% tags.each do |tag| %>
+        <%= render 'admin/posts/tags/dialog/tag', tag: tag, post: @post %>
+      <% end %>
+    </ul>
+  </div>
+</div>

data/lib/ecrire/app/views/admin/posts/tags/index.js.erb

@@ -0,0 +1 @@
+e.HTML = "<%= j render('admin/posts/tags/dialog/tags', tags: @tags) %>".toHTML()

data/lib/ecrire/app/views/admin/posts/tags/update.js.erb

@@ -0,0 +1,2 @@
+e.ObjectID = <%= @tag.id %>
+e.HTML = "<%= j render('admin/posts/tags/tag', post: @post, tag: @tag)%>".toHTML()

data/lib/ecrire/app/views/admin/titles/_title.html.erb

@@ -0,0 +1,11 @@
+<div class='overlay' as='Overlay'>
+  <%= content_tag :div, class: %w(popup), as: 'Post.Title', href: admin_title_path(post.titles.last), method: 'PUT' do %>
+    <div class='progressbar'>
+      <span class='progress'></span>
+    </div>
+    <h3>Modify your title</h3>
+    <%= content_tag :div, post.title, contenteditable: true, class: %w(input) %>
+    <ul class='errors'></ul>
+    <p>Press Enter to update, or dismiss the popup to cancel.</p>
+  <% end %>
+</div>

data/lib/ecrire/app/views/admin/titles/_titles.html.erb

@@ -0,0 +1,22 @@
+<div class='overlay' as='Overlay'>
+  <%= content_tag :div, class: %w(popup), as: 'Post.Title', href: admin_post_titles_path(post), method: 'POST' do %>
+    <div class='progressbar'>
+      <span class='progress'></span>
+    </div>
+    <h3>Create a new title</h3>
+    <%= content_tag :div, '', contenteditable: true, class: %w(input) %>
+    <ul class='errors'></ul>
+    <p>Press Enter to update, or dismiss the dialog to cancel.</p>
+    <p>For SEO & accessibility reason, you cannot edit previous post title for a published post. You can create a new title that will be the default one.</p>
+    <p><strong> All previous URL will redirect to the default newest URL.</strong></p>
+    <ul class='titles'>
+      <h4>Existing titles</h4>
+      <% post.titles.each do |title| %>
+        <%= content_tag :li do %>
+          <p class='title'><%= content_tag :strong, title.name %></p>
+          <%= content_tag :p, post_path(post, title: title, only_path: false), class: %w(url) %>
+        <% end %>
+      <% end %>
+    </ul>
+  <% end %>
+</div>

data/lib/ecrire/app/views/admin/titles/create.js.erb

@@ -0,0 +1 @@
+e.Title = "<%= j @title.name %>"

data/lib/ecrire/app/views/admin/titles/edit.js.erb

@@ -0,0 +1 @@
+e.HTML = "<%= j render('title', post: post) %>".toHTML()

data/lib/ecrire/app/views/admin/titles/errors.js.erb

@@ -0,0 +1,5 @@
+e.Errors = [
+  <% @title.errors.each do |key, message| %>
+    "<%= j content_tag(:li, message) %>".toHTML(),
+  <% end %>
+]

data/lib/ecrire/app/views/admin/titles/index.js.erb

@@ -0,0 +1 @@
+e.HTML = "<%= j render('titles', post: post) %>".toHTML()

data/lib/ecrire/app/views/admin/titles/update.js.erb

@@ -0,0 +1 @@
+e.Title = "<%= j @title.name %>"

data/lib/ecrire/app/views/layouts/admin/application.html.erb

@@ -17,7 +17,7 @@
           </div>
           <div class='posts'>
             <h4>
-              <%= link_to 'New post', new_title_admin_posts_path, class: %w(new button) %>
+              <%= link_to 'New post', new_admin_post_path, class: %w(new button) %>
             </h4>
             <%= link_to admin_posts_path(type: :draft), class: %w(drafts), remote: true, as: 'Posts.Popup' do %>
               <span class='type'>Drafts</span>

data/lib/ecrire/app/views/sessions/_navigation.html.erb

@@ -2,7 +2,7 @@
 
   <section>
     <div class='posts'>
-      <%= link_to 'New post', new_title_admin_posts_path, class: %w(new button) %>
+      <%= link_to 'New post', new_admin_post_path, class: %w(new button) %>
       <%= link_to admin_posts_path(type: :draft), class: %w(drafts), remote: true, as: 'Posts.Popup' do %>
         <span class='type'>Drafts</span>
         <%= content_tag :span, Post.drafted.count, class: %w(count) %>

data/lib/ecrire/application.rb

@@ -2,7 +2,7 @@ require 'warden'
 require 'pg'
 require 's3'
 require 'kaminari'
-require 'jointjs'
+require 'observejs'
 
 module Ecrire
   class Application < Rails::Application

data/lib/ecrire/config/routes.rb

@@ -14,9 +14,10 @@ Ecrire::Application.routes.draw do
     root 'posts#index'
     resources :posts do
       collection do
-        get 'new/title', controller: :posts, action: :new
         get 'help', controller: :posts, action: :help
       end
+      resources :tags, only: [:index, :create, :update], module: 'posts'
+      resources :titles, shallow: true
       resource :image, shallow: true
       resource :properties, only: [:create, :destroy]
     end
@@ -29,4 +30,3 @@ Ecrire::Application.routes.draw do
   get '/:view', to: 'static#show'
 
 end
-

data/lib/ecrire/db/migrate/20150305123321_move_labels_to_titles.rb

@@ -0,0 +1,27 @@
+class MoveLabelsToTitles < ActiveRecord::Migration
+  class Title < ActiveRecord::Base
+    belongs_to :post
+  end
+
+  class Post < ActiveRecord::Base
+  end
+
+  def change
+    rename_table :labels, :titles
+
+    add_column :titles, :slug, :string, index: true
+    change_column :titles, :name, :string, unique: true, null: false
+    add_reference :titles, :post, index: true
+
+    Post.all.each do |post|
+      Title.create do |t|
+        t.slug = post.slug
+        t.name = post.title
+        t.post = post
+      end
+    end
+
+    remove_column :posts, :title
+    remove_column :posts, :slug
+  end
+end

data/lib/ecrire/db/migrate/20150318549479_create_tags.rb

@@ -0,0 +1,13 @@
+class CreateTags < ActiveRecord::Migration
+  def change
+    create_table :tags do |t|
+
+      t.string :name, null: false
+      t.timestamps
+    end
+
+    add_index :tags, :name, unique: true
+
+    add_column :posts, :tags, :integer, array: true, defaut: []
+  end
+end

data/lib/ecrire/db/schema.rb

@@ -11,46 +11,31 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150120093481) do
+ActiveRecord::Schema.define(version: 20150318549479) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
   enable_extension "hstore"
 
-  create_table "abtests", force: :cascade do |t|
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
   create_table "images", force: :cascade do |t|
-    t.string   "url",        limit: 255
-    t.string   "key",        limit: 255
+    t.string   "url"
+    t.string   "key"
     t.integer  "post_id"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.boolean  "favorite"
   end
 
-  create_table "labels", force: :cascade do |t|
-    t.string   "name",       limit: 255, null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "labels", ["name"], name: "index_labels_on_name", using: :btree
-
   create_table "partials", force: :cascade do |t|
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "title",      limit: 255, null: false
+    t.string   "title",      null: false
     t.text     "content"
     t.text     "stylesheet"
     t.text     "javascript"
   end
 
   create_table "posts", force: :cascade do |t|
-    t.string   "title",            limit: 255, null: false
-    t.string   "slug",             limit: 255, null: false
     t.text     "content"
     t.text     "stylesheet"
     t.datetime "published_at"
@@ -60,13 +45,31 @@ ActiveRecord::Schema.define(version: 20150120093481) do
     t.hstore   "properties"
     t.text     "compiled_content"
     t.text     "compiled_excerpt"
+    t.integer  "tags",             array: true
+  end
+
+  create_table "tags", force: :cascade do |t|
+    t.string   "name",       null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "tags", ["name"], name: "index_tags_on_name", unique: true, using: :btree
+
+  create_table "titles", force: :cascade do |t|
+    t.string   "name",       null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "slug"
+    t.integer  "post_id"
   end
 
-  add_index "posts", ["title"], name: "index_posts_on_title", unique: true, using: :btree
+  add_index "titles", ["name"], name: "index_titles_on_name", using: :btree
+  add_index "titles", ["post_id"], name: "index_titles_on_post_id", using: :btree
 
   create_table "users", force: :cascade do |t|
-    t.string   "email",              limit: 255, null: false
-    t.string   "encrypted_password", limit: 255, null: false
+    t.string   "email",              null: false
+    t.string   "encrypted_password", null: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end

data/lib/ecrire/onboarding/assets/javascripts/base.js

@@ -1,2 +1,2 @@
-//= require joint
+//= require observejs
 //= require_tree .

data/lib/ecrire/onboarding/assets/javascripts/databases/information.js.coffee

@@ -1,4 +1,4 @@
-Joint.bind 'Database.Information', class
+ObserveJS.bind 'Database.Information', class
   loaded: =>
     @on 'input', @element().querySelector('form'), @update
 

data/lib/ecrire/onboarding/assets/javascripts/message.js.coffee

@@ -1,4 +1,4 @@
-Joint.bind 'Message', class
+ObserveJS.bind 'Message', class
   loaded: =>
 
   remove: =>

data/lib/ecrire/template/Gemfile

@@ -1,10 +1,10 @@
 source 'https://rubygems.org'
 
-gem 'ecrire',               git: 'https://github.com/pothibo/ecrire'
+gem 'ecrire',               path: '~/Develop/ecrire'
 
 group :required do
   gem 'rails',             '~> 4.2'
-  gem 'jointjs',           '~> 0.0'
+  gem 'observejs',         '~> 0.0'
   gem 'warden',            '~> 1.2'
   gem 'bcrypt',            '~> 3.1'
   gem 'nokogiri',          '~> 1.6'
@@ -18,7 +18,8 @@ group :required do
   gem 'coffee-rails',      '~> 4.0'
   gem 'turbolinks',        '~> 2.2'
   gem 'bourbon',           '~> 3.2'
-  gem 'uglifier',         '~> 2.5'
+  gem 'uglifier',          '~> 2.5'
+  gem 'jbuilder'           '~> 2.2'
 end
 
 group :server do

data/lib/ecrire/template/assets/javascripts/base.js.coffee

@@ -0,0 +1 @@
+#= require_tree .

data/lib/ecrire/version.rb

@@ -1,3 +1,3 @@
 module Ecrire
-  VERSION = '0.22.1'
+  VERSION = '0.23.0'
 end

data/test/editor/controllers/base_controller_test.rb

@@ -1,4 +1,5 @@
 require 'editor/test_helper'
+require 'byebug'
 
 class BaseControllerTest < ActionController::TestCase
   include Warden::Test::Helpers

data/test/editor/models/post_test.rb

@@ -1,6 +1,26 @@
 require 'editor/test_helper'
 
 class PostTest < ActiveSupport::TestCase
+
+  test 'creation will bind a new title to this post' do
+    post = Post.new
+    post.title = "test"
+    assert post.save, post.errors.full_messages.to_sentence
+    assert post.titles.count == 1
+    post.titles.each do |title|
+      assert title.persisted?
+    end
+  end
+
+  test 'post can have tags' do
+    tag = tags(:ruby)
+    post = posts(:published)
+    post.tags << tag
+    assert post.save, post.errors.full_messages.to_sentence
+    assert post.tags.include?(tag)
+    assert post.read_attribute(:tags).include?(tag.id)
+  end
+
   test "fetch published post" do
     @posts = Post.status("published")
     assert_equal @posts.count, Post.published.count
@@ -26,7 +46,7 @@ class PostTest < ActiveSupport::TestCase
 
   test "publishing a post" do
     @post = Post.new
-    @post.title = "Some new post"
+    @post.titles << Title.new(name: "Some new post", post: @post)
     assert @post.draft?, "Should be a draft"
     @post.publish!
     assert @post.published?, "Should be published"
@@ -39,28 +59,16 @@ class PostTest < ActiveSupport::TestCase
     assert_equal published_at, @post.published_at, "Shouldn't be able to change the published date"
   end
 
-  test "should create a slug if none exist" do
-    @post = Post.new
-    @post.title = "some test"
-    !@post.save
-    assert !@post.slug.nil?
-  end
-
-  test "can't save a post if the title already exists" do
-    @old_post = Post.first
-    @post = Post.new
-    @post.title = @old_post.title
-    assert !@post.save, "The post shouldn't save."
-    assert @post.errors.has_key?(:title), 'There should be an error with the title'
-  end
-
   test "exerpt does not include images" do
-    post = Admin::Post.create!({
-      title: "A new post",
+    post = Admin::Post.new({
       content: "Hello
       ![a](http://google.com)"
     })
 
+    post.titles << Admin::Title.new(name: "Post Image test.", post: post)
+
+    assert post.save, post.errors.full_messages.to_sentence
+
     html = Nokogiri::HTML(post.compiled_excerpt)
 
     assert html.css('p').length > 0
@@ -68,42 +76,4 @@ class PostTest < ActiveSupport::TestCase
 
   end
 
-  test "can't save a post if the slug already exists" do
-    @old_post = Post.first
-    @post = Post.new
-    @post.slug = @old_post.slug
-    assert !@post.save, "The post shouldn't save."
-    assert @post.errors.has_key?(:slug), 'There should be an error with the slug'
-  end
-
-  test 'should be able to add labels' do
-    @post = posts(:draft)
-    label = Label.create(name: 'A label')
-    @post.labels = [label]
-    assert @post.save
-  end
-
-  test 'labels are arrays of Label' do
-    @post = posts(:draft)
-    label = Label.create(name: 'A label')
-    @post.labels = [label]
-    assert @post.save
-    assert_equal @post.labels.first, label
-    assert_kind_of Array, @post.labels
-    assert_kind_of Label, @post.labels.first
-  end
-
-  test 'labels are instance of Label' do
-  end
-
-  test 'only 1 image can be associated with a post' do
-    post = Admin::Post.create!(title: 'A post with some image')
-    assert_equal 1, Image.where('post_id = ?', post.id).count
-
-    post.content = '# Hello world'
-    post.save!
-
-    assert_equal 1, Image.where('post_id = ?', post.id).count
-  end
-
 end