ecrire 0.21.0 → 0.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9187d5d3cf47bd6d98975d2c7e98f78fca7e724
-  data.tar.gz: bb54f17491247dfe317ca7ba9ef3fe78089936c7
+  metadata.gz: 1ca953837db65f9e27113c5399ce13c2353939bf
+  data.tar.gz: 2289e12808f0202798eb783bbd30fd055cbbc8e6
 SHA512:
-  metadata.gz: d7887948635cf02da8caaed5c802c34e2f8ca0baa3e6d53f8cf04caccec39444a542a67a45a9b2026b739b9ca5ff290544f0908e9b3fefb96b4724e2ab8c9d60
-  data.tar.gz: b12bfee9bd7bde93f8d37b514df86f01add1c972884998af6fa05a930aae3e610eee4b1f9000fe1c5ac281940dc0b42fa9f40bc288498c617c2741965e1375d5
+  metadata.gz: e64e5dd7ce4c0aba279e3385837b6e3d6057e29c6f2db4f221f0da51c59780575dbe872b82366a0d97e7fc73c9ac5a612f6ca44633f2558f662ef47b398ae2e8
+  data.tar.gz: e208f922deb272f90de0d89df47c7299c10a33ff267109589e0d1f83cdcc43eb19bde09e8a299a98b996fe9d21b0fec6234ec52caeaa9e2ccf2fc3879215ccc8

data/lib/ecrire/app/assets/javascripts/admin/editor/content.coffee

@@ -260,11 +260,21 @@ Joint.bind 'Editor.Content', class @Editor
 
 
   same: (node1, node2) =>
+    node1 = node1.cloneNode(true)
+    node2 = node2.cloneNode(true)
+
+    for el in node1.querySelectorAll('[contenteditable=false]')
+      el.remove()
+
+    for el in node2.querySelectorAll('[contenteditable=false]')
+      el.remove()
+
     node1.nodeName == node2.nodeName &&
     node1.innerHTML.trim() == node2.innerHTML.trim()
 
 
 
+
   parse: (fragment) =>
     for p in @parsers
       line = fragment.firstChild

data/lib/ecrire/app/assets/javascripts/admin/editor/extensions/clipboard.coffee

@@ -74,7 +74,6 @@ Editor.Extensions.push class ClipBoard
 
 
   insert: (texts, sel) =>
-
     node = sel.anchorNode
     str = node.textContent
     text = texts.map((t) ->
@@ -89,7 +88,9 @@ Editor.Extensions.push class ClipBoard
     while line.parentElement != @editor.element()
       line = line.parentElement
 
-    offset = @nodeOffset(node,line) + sel.anchorOffset + text.length
+    offset = sel.anchorOffset + text.length
+    if node != line
+      offset += @nodeOffset(node, line)
 
     fragment = @editor.parse(@editor.cloneNodesFrom(line))
 
@@ -99,15 +100,13 @@ Editor.Extensions.push class ClipBoard
     cursor.update(@editor.walker(cursor.focus(lines[0])), true)
 
   nodeOffset: (node, line) ->
-    if !line.contains(node)
-      raise "Looking for a node that is not inside the given line"
-      return
-
     offset = 0
 
     for n in line.childNodes
       if n == node
         break
+      else if n.childNodes.length > 0
+        offset += @nodeOffset(node, n)
       else
         offset += n.textContent.length
 

data/lib/ecrire/app/assets/javascripts/admin/editor/navigation/save.js.coffee

@@ -3,6 +3,7 @@ Joint.bind 'Editor.Save', class
     @button = @element().querySelector('button')
     @time = @element().querySelector('div.update > p')
 
+    @on 'keydown', document, @shouldSave
     @on 'Editor:loaded', document, @cache
     @on 'Editor:updated', document, @update
     @on 'posts:update', document, @saved
@@ -32,11 +33,36 @@ Joint.bind 'Editor.Save', class
       cache
     @cache()
 
+  dirty: =>
+    @cache()? && @cache() != PostBody.instance.toString()
+
+  shouldSave: (e) =>
+    if e.metaKey isnt true || e.which isnt 83
+      return
+
+    e.preventDefault()
+    e.stopPropagation()
+
+    if @dirty()
+      @save(e)
+    else
+      @nudge()
+
+  nudge: =>
+    button = document.querySelector("[as='Editor.Save'] button")
+    clean = ->
+      button.classList.remove('nudge')
+
+    button.addEventListener 'animationend', clean
+    button.addEventListener 'webkitAnimationEnd', clean
+    button.classList.add('nudge')
+
   save: (e) =>
     e.preventDefault()
     e.stopPropagation()
 
-    xhr = new Joint.XHR(e.target.form)
+    form = document.querySelector("[as='Editor.Save']")
+    xhr = new Joint.XHR(form)
     xhr.data.set('post[content]', PostBody.instance.toString())
     xhr.data.set('context', 'content')
     xhr.send()
@@ -48,11 +74,9 @@ Joint.bind 'Editor.Save', class
       @cache(true)
 
   update: (e) =>
-    return unless @cache()?
-    if @cache() != PostBody.instance.toString()
+    if @dirty()
       @button.removeAttribute('disabled')
       @button.textContent = @button.getAttribute('dirty')
     else
       @button.setAttribute('disabled', 'disabled')
       @button.textContent = @button.getAttribute('persisted')
-

data/lib/ecrire/app/assets/stylesheets/admin/editor/content.css.scss

@@ -6,27 +6,29 @@ body.edit.posts > main > section {
     padding-bottom: 10em;
 
     h1 {
-      font-size: 2.6em;
+      font-size: 2.4em;
     }
 
     h2 {
-      font-size: 2.3em;
+      font-size: 2.1em;
     }
 
     h3 {
-      font-size: 2.0em;
+      font-size: 1.8em;
     }
 
     h4 {
-      font-size: 1.7em;
+      font-size: 1.6em;
     }
 
     h5 {
-      font-size: 1.6em;
+      font-weight: bold;
+      font-size: 1.4em;
     }
 
     h6 {
-      font-size: 1.3em;
+      font-weight: bold;
+      font-size: 1.2em;
     }
 
     & > *, & > ul > li, & > ol > li {

data/lib/ecrire/app/assets/stylesheets/admin/editor/save.css.scss

@@ -29,6 +29,11 @@ body.posts > main > section > div.save {
     &:hover:not([disabled]) {
       background: #68B2A7;
     }
+
+    &.nudge {
+      @include animation(nudge 0.1s ease);
+      @include animation-iteration-count(2);
+    }
   }
 
   div.update {
@@ -42,3 +47,24 @@ body.posts > main > section > div.save {
   }
 }
 
+@include keyframes(nudge) {
+  0% {
+    margin-left: 0;
+    margin-right: 0;
+  }
+
+  25% {
+    margin-left: 10px;
+    margin-right: 0;
+  }
+
+  75% {
+    margin-left: 0;
+    margin-right: 10px;
+  }
+
+  100% {
+    margin-left: 0;
+    margin-right: 0;
+  }
+}

data/lib/ecrire/app/assets/stylesheets/application.css.scss

@@ -3,10 +3,3 @@
 @import 'shared/**/*';
 @import 'admin/navigation';
 @import 'sessions';
-
-ol, ul {
-  list-style-type: none;
-  margin: 0;
-  padding: 0;
-}
-

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

@@ -10,16 +10,16 @@ module Admin
         href: admin_post_path(@post.id) do |div|
 
           if Rails.application.secrets.has_key?(:s3)
-            div[:bucket] = Rails.application.secrets.s3['bucket'],
-            div[:access_key] = Rails.application.secrets.s3['access_key'],
-            div[:signature] = image_form_signature(image_form_policy(@post)),
+            div[:bucket] = Rails.application.secrets.s3['bucket']
+            div[:access_key] = Rails.application.secrets.s3['access_key']
+            div[:signature] = image_form_signature(image_form_policy(@post))
             div[:policy] = image_form_policy(@post)
             if Rails.application.secrets.s3.has_key?('namespace')
               div['namespace'] = Rails.application.secrets.s3['namespace']
             end
           end
 
-          post.content
+          h(post.content)
         end
     end
   end

data/lib/ecrire/db/schema.rb

@@ -17,9 +17,14 @@ ActiveRecord::Schema.define(version: 20150120093481) do
   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"
-    t.string   "key"
+    t.string   "url",        limit: 255
+    t.string   "key",        limit: 255
     t.integer  "post_id"
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -27,7 +32,7 @@ ActiveRecord::Schema.define(version: 20150120093481) do
   end
 
   create_table "labels", force: :cascade do |t|
-    t.string   "name",       null: false
+    t.string   "name",       limit: 255, null: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -37,15 +42,15 @@ ActiveRecord::Schema.define(version: 20150120093481) do
   create_table "partials", force: :cascade do |t|
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "title",      null: false
+    t.string   "title",      limit: 255, null: false
     t.text     "content"
     t.text     "stylesheet"
     t.text     "javascript"
   end
 
   create_table "posts", force: :cascade do |t|
-    t.string   "title",            null: false
-    t.string   "slug",             null: false
+    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,8 +65,8 @@ ActiveRecord::Schema.define(version: 20150120093481) do
   add_index "posts", ["title"], name: "index_posts_on_title", unique: true, using: :btree
 
   create_table "users", force: :cascade do |t|
-    t.string   "email",              null: false
-    t.string   "encrypted_password", null: false
+    t.string   "email",              limit: 255, null: false
+    t.string   "encrypted_password", limit: 255, null: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end

data/lib/ecrire/template/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'ecrire',               path: '~/Develop/ecrire'
+gem 'ecrire',               git: 'https://github.com/pothibo/ecrire'
 
 group :required do
   gem 'rails',             '~> 4.2'

data/lib/ecrire/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecrire
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.1
 platform: ruby
 authors:
 - Pier-Olivier Thibault
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-28 00:00:00.000000000 Z
+date: 2015-03-08 00:00:00.000000000 Z
 dependencies: []
 description: Blog engine on Rails
 email: pothibo@gmail.com
@@ -271,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Blog engine