ecrire 0.22.1 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ca953837db65f9e27113c5399ce13c2353939bf
-  data.tar.gz: 2289e12808f0202798eb783bbd30fd055cbbc8e6
+  metadata.gz: f76b1ffb5a76e8b346bdd15ab2fc6b2b9ddffcbf
+  data.tar.gz: 996185339a3a617b693bc5781891d926d3334f73
 SHA512:
-  metadata.gz: e64e5dd7ce4c0aba279e3385837b6e3d6057e29c6f2db4f221f0da51c59780575dbe872b82366a0d97e7fc73c9ac5a612f6ca44633f2558f662ef47b398ae2e8
-  data.tar.gz: e208f922deb272f90de0d89df47c7299c10a33ff267109589e0d1f83cdcc43eb19bde09e8a299a98b996fe9d21b0fec6234ec52caeaa9e2ccf2fc3879215ccc8
+  metadata.gz: 36e7377ebb0b601c51dfeed39a3b12a8eb4af0bf5068cb2acd2e5b033969473e4560a8b374b6ffca757259e9dcd8ea6768840327b9abbefbee9fa36d02656c9b
+  data.tar.gz: d8bf17c5c38fb86e482d44f8d30e809142617a81decd9a2340ba5c4b4378ee45c195d7589843f2538a6b3688617a1361ead70f23105141225012c83620c831a2

data/.gitignore

@@ -15,6 +15,7 @@
 log
 /tmp
 
-secrets.yml
 .DS_Store
 Gemfile.lock
+
+/lib/ecrire/template/secrets.yml

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  2.1.0
+
+script: "bundle exec rake test"

data/Gemfile

@@ -2,3 +2,22 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'rails',             '~> 4.2'
+gem 'observejs',         git: 'https://github.com/pothibo/observejs.git'
+gem 'warden',            '~> 1.2'
+gem 'bcrypt',            '~> 3.1'
+gem 'nokogiri',          '~> 1.6'
+gem 's3',                '~> 0.3'
+gem 'pg',                '~> 0.17'
+gem 'kaminari',          '~> 0.15'
+gem 'kramdown',          '~> 1.5'
+
+gem 'sprockets-rails',   '~> 2.1'
+gem 'sass-rails',        '~> 4.0', '>= 4.0.3'
+gem 'coffee-rails',      '~> 4.0'
+gem 'turbolinks',        '~> 2.2'
+gem 'bourbon',           '~> 3.2'
+gem 'uglifier',          '~> 2.5'
+gem 'jbuilder',          '~> 2.2'
+
+gem 'byebug'

data/README.md

@@ -1,5 +1,7 @@
 # Ecrire
 
+[![Build Status](https://travis-ci.org/pothibo/ecrire.svg?branch=master)](https://travis-ci.org/pothibo/ecrire)
+
 Ecrire is a blog built *on top* of Ruby on Rails. The goal of this blog engine is to make it **easy** to start a blog while keeping control over the content. You can see this as an alternative to WordPress.
 
 ## The editor

data/Rakefile

@@ -38,7 +38,7 @@ namespace :database do
   end
 
   task :purge do
-    [User, Post, Image, Partial, Label].each(&:delete_all)
+    [User, Post, Image, Partial, Title].each(&:delete_all)
   end
 
 end

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

@@ -1,4 +1,4 @@
-Joint.bind 'Editor.Content', class @Editor
+ObserveJS.bind 'Editor.Content', class @Editor
 
   loaded: =>
     @on 'keydown', @linefeed
@@ -38,13 +38,11 @@ Joint.bind 'Editor.Content', class @Editor
 
 
 
-  outdated: (mutations) =>
+  outdated: (observedMutations) =>
     @observer.hold =>
-      for mutation in mutations
-        @appended(node, mutation.target) for node in mutation.addedNodes
-        @removed(node, mutation.target) for node in mutation.removedNodes
-        if mutation.type == 'characterData'
-          @update mutation.target
+      mutations = new Mutations(observedMutations, @element())
+      if mutations.target?
+        @updated(mutations)
 
     event = new CustomEvent('Editor:updated', {bubbles: true})
     @element().dispatchEvent(event)
@@ -83,7 +81,11 @@ Joint.bind 'Editor.Content', class @Editor
 
 
 
-  update: (node) ->
+  updated: (mutations) ->
+    if mutations.target.contentEditable == 'false'
+      return
+
+    node = mutations.target
     while node? && node.parentElement != @element()
       node = node.parentElement
 
@@ -92,7 +94,10 @@ Joint.bind 'Editor.Content', class @Editor
     walker = @walker(node)
 
     sel = window.getSelection()
-    offset = @lineOffset(node, (sel.focusNode || node), sel.focusOffset)
+    if sel.type == 'None'
+      offset = 0
+    else
+      offset = @lineOffset(node, (sel.focusNode || node), sel.focusOffset)
 
     if node.previousElementSibling?
       node = node.previousElementSibling
@@ -106,66 +111,6 @@ Joint.bind 'Editor.Content', class @Editor
       cursor.update(@walker(line))
       @scrollLineIntoView(cursor.focus())
 
-
-  removed: (node, line) =>
-    while line? && line.parentElement != @element()
-      line = line.parentElement
-
-    if node.nodeType != 1 || (node instanceof HTMLBRElement && node.parentElement?)
-      node.remove()
-
-    if line?
-      sel = window.getSelection()
-      offset = @lineOffset(line, sel.focusNode, sel.focusOffset)
-      cursor = new Editor.Cursor(offset)
-
-      lines = @parse(@cloneNodesFrom(line))
-
-      @observer.hold =>
-        line = cursor.focus(@updateDOM(line, lines)[0])
-        cursor.update(@walker(line))
-
-    if @element().childNodes.length == 0
-      p = "<p>".toHTML()
-      @element().appendChild(p)
-      cursor = new Editor.Cursor(offset)
-      cursor.update(@walker(p), 0)
-
-
-
-  appended: (node) =>
-    el = node
-    while el? && el.parentElement != @element()
-      el = el.parentElement
-
-    return unless el?
-
-    elements = el.querySelectorAll('[contenteditable=false]')
-
-    for element in elements
-      if element.contains(node)
-        return
-
-    if node instanceof HTMLBRElement
-      node.remove()
-      return
-
-    node = el
-
-    sel = window.getSelection()
-    offset = @lineOffset(el, sel.focusNode, sel.focusOffset)
-    cursor = new Editor.Cursor(offset)
-
-    lines = @parse(@cloneNodesFrom(node))
-
-    @observer.hold =>
-      lines = @updateDOM(node, lines)
-      if node != lines[0]
-        cursor.update(@walker(lines[0]))
-      @scrollLineIntoView(lines[0])
-
-
-
   scrollLineIntoView: (line) =>
     height = window.innerHeight
     rect = line.getBoundingClientRect()
@@ -263,18 +208,11 @@ Joint.bind 'Editor.Content', class @Editor
     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
@@ -380,5 +318,37 @@ class LineFeed
       @fragment.appendChild(node)
 
 
+class Mutations
+  constructor: (mutations, editor) ->
+    @removed = []
+    @appended = []
+    @updated = []
+
+    for mutation in mutations
+      @setTarget(mutation.target, editor)
+      if mutation.addedNodes.length > 0
+        @appended.push mutation.target
+      else if mutation.type == 'characterData'
+        @updated.push mutation.target
+      else
+        @removed.push mutation.target
+
+  setTarget: (target, editor) ->
+    return unless target.parentElement? && target != editor
+    if @target? && @target.compareDocumentPosition(target) & Node.DOCUMENT_POSITION_FOLLOWING
+      @target = target
+    else
+      @target = target
+
+  status: =>
+    if @appended.length > 0
+      "appended"
+    else if @updated.length > 0
+      'updated'
+    else if @removed.length > 0
+      'removed'
+    else
+      'none'
+
 Editor.Parsers = []
 Editor.Extensions = []

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

@@ -23,6 +23,9 @@ HTMLDivElement::toString = ->
 HTMLPreElement::toString = ->
   @textContent
 
+HTMLElement::toString = ->
+  @textContent
+
 HTMLHeadingElement::toString = HTMLParagraphElement::toString = ->
   @textContent
 

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

@@ -105,8 +105,9 @@ Editor.Extensions.push class ClipBoard
     for n in line.childNodes
       if n == node
         break
-      else if n.childNodes.length > 0
+      else if n.contains(node)
         offset += @nodeOffset(node, n)
+        break
       else
         offset += n.textContent.length
 

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

@@ -1,4 +1,4 @@
-Joint.bind 'Editor.Code', class
+ObserveJS.bind 'Editor.Code', class
   loaded: =>
     document.addEventListener 'keydown', @filter, true
 
@@ -7,4 +7,3 @@ Joint.bind 'Editor.Code', class
       when 13 then @linefeed(e)
 
   linefeed: (e) =>
-

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

@@ -1,8 +1,14 @@
-Joint.bind 'Editor.Image', class
+ObserveJS.bind 'Editor.Image', class
   loaded: =>
     @element().addEventListener 'dragover', @over
     @element().addEventListener 'dragleave', @cancel
     @element().addEventListener 'drop', @drop
+    @on 'click', @container(), @open
+    @on 'change', @element().querySelector('input'), @upload
+    if @element().querySelector('figcaption').hasAttribute('name')
+      @show()
+    else
+      @placehold()
 
   over: (e) =>
     e.preventDefault()
@@ -15,5 +21,71 @@ Joint.bind 'Editor.Image', class
   drop: (e) =>
     e.preventDefault()
     @element().classList.remove 'dropping'
+    e.file = e.dataTransfer.files[0]
+    @upload(e)
 
+  show: =>
+    img = @retrieve('img')
+    img.src = @element().querySelector('figcaption').getAttribute('name')
+    @container().appendChild(img)
 
+  placehold: =>
+    placeholder = @retrieve('.placeholder')
+    @container().appendChild(placeholder)
+
+  container: =>
+    @container.element ||= @element().querySelector('div[contenteditable=false]')
+
+  open: =>
+    @container().querySelector('input').click()
+
+  uploaded: (e) =>
+    xml = new DOMParser().parseFromString(e.target.response, 'text/xml')
+    url = xml.querySelector('Location').textContent
+    img = @retrieve('img')
+    img.src = url
+    progressBar = @retrieve('.progressbar')
+    @container().insertBefore(img, progressBar)
+    progressBar.remove()
+    @retrieve('.placeholder').remove()
+    @element().querySelector('figcaption').lastChild.textContent = "(#{url})"
+
+  upload: (e) =>
+    @container().appendChild(@retrieve('.progressbar'))
+    unless e.file?
+      e.file = e.target.files[0]
+    id = PostBody.getAttribute('postid')
+    policy = PostBody.getAttribute('policy')
+    signature = PostBody.getAttribute('signature')
+    bucket = PostBody.getAttribute('bucket')
+    namespace = PostBody.getAttribute('namespace')
+    access_key = PostBody.getAttribute('access_key')
+
+    url = "https://s3.amazonaws.com/#{bucket}/"
+    dir = [id]
+    if namespace?
+      dir.splice(0,0, namespace)
+
+    dir = dir.join '/'
+
+    data = new FormData()
+    data.append 'AWSAccessKeyId', access_key
+    data.append 'success_action_status', 201
+    data.append 'acl', 'private'
+    data.append 'policy', policy
+    data.append 'signature', signature
+    data.append 'key', "#{dir}/#{e.file.name}"
+    data.append 'Content-Type', e.file.type
+    data.append 'file', e.file
+
+    xhr = new XMLHttpRequest()
+    xhr.open('POST', url, true)
+    xhr.onload = @uploaded
+    xhr.onprogress = @progress
+    xhr.send(data)
+
+  progress: (e) =>
+    return unless e.lengthComputable
+    percentComplete = e.loaded / e.total * 100.0;
+    progressBar = @retrieve('.progressbar')
+    progressBar.firstElementChild.style.width = "#{percentComplete}%";

data/lib/ecrire/app/assets/javascripts/admin/editor/parsers/image.coffee

@@ -9,121 +9,12 @@ Editor.Parsers.push class
     @match?
 
   render: =>
-    @container = new Container()
+    @figure = EditorElements.content.querySelector("[as='Editor.Image']").cloneNode(true)
 
-    @uploader = new Editor.ImageUploader(@show)
-
-
-    @picture = "<div class='image' as='Editor.Image'>".toHTML()
-
-    @title = "<em></em>".toHTML()
-    @title.appendChild document.createTextNode(@match[1])
-    @title.appendChild document.createTextNode(@match[3])
+    @caption = @figure.querySelector('figcaption')
+    @caption.appendChild document.createTextNode(@match[1])
+    @caption.appendChild document.createTextNode(@match[3])
     if @match[4]?
-      @title.setAttribute('name', @match[4])
-
-    @picture.appendChild @container.toHTML(@match[4])
-    @picture.appendChild @title
-
-    @container.input.addEventListener 'change', @update
-    @picture.addEventListener 'drop', @drop
-
-    return @picture
-
-  show: (e, url) =>
-    @container.image(url)
-    @title.lastChild.textContent = "(#{url})"
-
-  update: (e) =>
-    unless e.file?
-      e.file = e.target.files[0]
-    @container.loading()
-    @uploader.send(e)
-
-  drop: (e) =>
-    e.preventDefault()
-    e.file = e.dataTransfer.files[0]
-    @update(e)
-
-
-class Container
-  constructor: ->
-    @el = "<div contenteditable=false></div>".toHTML()
-    @el.addEventListener 'click', @open
-
-    if !(@input = @el.querySelector('input'))?
-      @input = "<input type='file'>".toHTML()
-
-    @el.appendChild(@input)
-
-  image: (url) =>
-    @el.style.backgroundImage = "url(#{url})"
-    @el.innerHTML = ''
-    @el.classList.remove 'loading'
-
-  loading: =>
-    @loading = =>
-      @el.classList.add 'loading'
-      @el.innerHTML = ''
-
-    @loading()
-
-  placeholder: =>
-    el = "<p>Drop an image or click here to upload a picture.</p>".toHTML()
-    @placeholder = =>
-      @el.innerHTML = ''
-      @el.appendChild(el)
-
-    @placeholder()
-
-  open: (e) =>
-    @input.click()
-
-  toHTML: (url) =>
-    if url?
-      @image(url)
-    else if @el.classList.contains('loading')
-      @loading()
-    else
-      @placeholder()
-
-    @el
-
-
-class Editor.ImageUploader
-  constructor: (@callback) ->
-
-  uploaded: (e) =>
-    xml = new DOMParser().parseFromString(e.target.response, 'text/xml')
-    url = xml.querySelector('Location').textContent
-    @callback(e, url)
-
-  send: (e) =>
-    id = PostBody.getAttribute('postid')
-    policy = PostBody.getAttribute('policy')
-    signature = PostBody.getAttribute('signature')
-    bucket = PostBody.getAttribute('bucket')
-    namespace = PostBody.getAttribute('namespace')
-    access_key = PostBody.getAttribute('access_key')
-
-    url = "https://s3.amazonaws.com/#{bucket}/"
-    dir = [id]
-    if namespace?
-      dir.splice(0,0, namespace)
-
-    dir = dir.join '/'
-
-    data = new FormData()
-    data.append 'AWSAccessKeyId', access_key
-    data.append 'success_action_status', 201
-    data.append 'acl', 'private'
-    data.append 'policy', policy
-    data.append 'signature', signature
-    data.append 'key', "#{dir}/#{e.file.name}"
-    data.append 'Content-Type', e.file.type
-    data.append 'file', e.file
+      @caption.setAttribute('name', @match[4])
 
-    xhr = new XMLHttpRequest()
-    xhr.open('POST', url, true)
-    xhr.onload = @uploaded
-    xhr.send(data)
+    return @figure

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

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

data/lib/ecrire/app/assets/javascripts/admin/{editor/navigation → navigation}/delete.js.coffee

@@ -1,4 +1,4 @@
-Joint.bind 'Post.Delete', class
+ObserveJS.bind 'Post.Delete', class
   loaded: =>
     @on 'change', @element().querySelector('input[type=checkbox]'), @toggle
 
@@ -8,4 +8,3 @@ Joint.bind 'Post.Delete', class
       button.removeAttribute('disabled')
     else
       button.setAttribute('disabled', 'disabled')
-

data/lib/ecrire/app/assets/javascripts/admin/{editor/navigation → navigation}/draft.js.coffee

@@ -1,4 +1,4 @@
-Joint.bind 'Editor.Draft', class
+ObserveJS.bind 'Editor.Draft', class
   resetInterval: 4000
   loaded: =>
     @on 'Editor:updated', document, @update
@@ -38,5 +38,3 @@ Joint.bind 'Editor.Draft', class
     unless @cached?
       @cached = e.target.textContent
       return
-
-

data/lib/ecrire/app/assets/javascripts/admin/{editor/navigation → navigation}/help.js.coffee

@@ -1,4 +1,4 @@
-Joint.bind 'Post.Documentation', class
+ObserveJS.bind 'Post.Documentation', class
   loaded: =>
     @on 'posts:help', @show
 

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

@@ -1,4 +1,4 @@
-Joint.bind 'Editor.Save', class
+ObserveJS.bind 'Editor.Save', class
   loaded: =>
     @button = @element().querySelector('button')
     @time = @element().querySelector('div.update > p')
@@ -62,7 +62,7 @@ Joint.bind 'Editor.Save', class
     e.stopPropagation()
 
     form = document.querySelector("[as='Editor.Save']")
-    xhr = new Joint.XHR(form)
+    xhr = new ObserveJS.XHR(form)
     xhr.data.set('post[content]', PostBody.instance.toString())
     xhr.data.set('context', 'content')
     xhr.send()

data/lib/ecrire/app/assets/javascripts/admin/{editor/navigation → navigation}/sticky.js.coffee

@@ -1,4 +1,4 @@
-Joint.bind 'Post.Sticky', class
+ObserveJS.bind 'Post.Sticky', class
   loaded: =>
     @on 'scroll', document, @scrolled
 
@@ -8,4 +8,3 @@ Joint.bind 'Post.Sticky', class
       @element().style.paddingTop = "#{Math.abs(top)}px"
     else
       @element().style.paddingTop = ''
-

data/lib/ecrire/app/assets/javascripts/admin/{editor/navigation → navigation}/toggle.js.coffee

@@ -1,4 +1,4 @@
-Joint.bind 'Navigation.Toggle', class
+ObserveJS.bind 'Navigation.Toggle', class
   loaded: =>
     @on 'click', @toggle
 
@@ -7,4 +7,3 @@ Joint.bind 'Navigation.Toggle', class
       Menu.style.marginTop = '0'
     else
       Menu.style.marginTop = ''
-