written 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e36c2f64be41a65d8bac7fdde2e86d3b54529cb6
-  data.tar.gz: 570b11448dc1be526eda6a768294b5d8c6423eae
+  metadata.gz: baeba731f6551380429d586b4cf9ce6958e87cc9
+  data.tar.gz: e8cb3235cc64c398e64cf7d87d3deee94f5eea47
 SHA512:
-  metadata.gz: 0159af44f886957579f72d2006b04338a1b525cd51f3b68c51e6b8dbdc7987e9d766ee1f679d66262c8d5fc032656cd26cccdcf33def2a633548bfec7f7d1831
-  data.tar.gz: a2107de3631865aaf514307c08ea4d6e1deeee36352f47d345a2aca0e070e66745c927cb040c192587815a1e4a4f8c97a11310db7cf9bb9120bf672749c176b6
+  metadata.gz: 904f533a3ab8b865659b82f7e26a10028f98708150facb7b7f9b8c0665aeabf38b8427329d6719c1bcc43ded3653c3b19db76594f99f37c99b02997bef00dc8d
+  data.tar.gz: 3e4db620d0eac31e9cb4252104fffbcede4660aadcd3f8bb5ad784bb17505e36c944f9579a356cbe2ba7f7efe4c63f00f22f596806e85a9f70ba2da3b252d3ff

data/lib/written/app/assets/javascripts/written/core/content.coffee

@@ -26,21 +26,19 @@ class @Written
   initialize: (text, parsers) ->
     @observer.pause()
     if !parsers?
-      parsers = Written.Parsers.default()
+      parsers = Written.Parsers
 
     @parsers = parsers
 
     if @element().contentEditable != 'true'
       @element().contentEditable = 'true'
 
-    @parsers.freeze()
-
     document = new Written.Document(text, @parsers)
     cursor = new Written.Cursor(@element(), window.getSelection())
     document.cursor = cursor
 
     
-    @update(document)
+    document.applyTo(@element())
     document.cursor.focus(document.toString().length)
 
     @history = new Written.History(document)
@@ -54,7 +52,9 @@ class @Written
     @element().dispatchEvent(event)
 
   changeTo: (text) =>
-    @update(new Written.Document(text, @parsers))
+    document = new Written.Document(text, @parsers)
+    @history.push(document)
+    document.applyTo(@element())
 
   changed: (e) =>
     oldDocument = @history.current
@@ -63,7 +63,7 @@ class @Written
     if @element().children.length > 0 && oldDocument.toString().localeCompare(newDocument.toString()) == 0
       return
 
-    @update(newDocument)
+    newDocument.applyTo(@element())
     @history.push(newDocument)
     @dispatch('written:changed', document: newDocument)
 
@@ -117,7 +117,7 @@ class @Written
       if cursor.offset < document.toString().length
         cursor.offset += 1
 
-      @update(document)
+      document.applyTo(@element())
       @history.push(document)
 
 
@@ -130,7 +130,7 @@ class @Written
 
     if document = @history.previous()
       @history.current = document
-      @update(@history.current)
+      document.applyTo(@element())
 
   redo: (e) =>
     if e.code == 'KeyZ' && e.metaKey && e.shiftKey
@@ -141,12 +141,12 @@ class @Written
 
     if document = @history.next()
       @history.current = document
-      @update(@history.current)
+      @history.current.applyTo(@element())
 
   toString: =>
     texts = []
     for node in @element().childNodes
-      content = node.toString().split('\n')
+      content = Written.Parsers.toString(node).split('\n')
       texts.push content.join('\n')
 
     texts.join '\n'

data/lib/written/app/assets/javascripts/written/core/cursor.coffee

@@ -15,7 +15,7 @@ class Written.Cursor
         child = node.previousSibling
 
         while child
-          @offset += Written.Stringify(child).length
+          @offset += Written.Parsers.toString(child).length
           child = child.previousSibling
 
         if node instanceof HTMLLIElement
@@ -27,7 +27,7 @@ class Written.Cursor
     for child in @element().children
       if child == node
         break
-      @offset += Written.Stringify(child).length
+      @offset += Written.Parsers.toString(child).length
       @offset += 1
 
     @currentNode = ->
@@ -39,7 +39,7 @@ class Written.Cursor
 
     element = @element().firstElementChild
     while element && element != node
-      offset -= Written.Stringify(element).length
+      offset -= Written.Parsers.toString(element).length
       element = element.nextElementSibling
 
     offset
@@ -53,12 +53,12 @@ class Written.Cursor
     if node is undefined
       node = @element().firstElementChild
 
-    while node.nextElementSibling && Written.Stringify(node).length < offset
-      offset -= Written.Stringify(node).length + 1
+    while node.nextElementSibling && Written.Parsers.toString(node).length < offset
+      offset -= Written.Parsers.toString(node).length + 1
       node = node.nextElementSibling
 
 
-    range = node.getRange(Math.min(offset, Written.Stringify(node).length), document.createTreeWalker(node, NodeFilter.SHOW_TEXT))
+    range = Written.Parsers.getRange(node, Math.min(offset, Written.Parsers.toString(node).length), document.createTreeWalker(node, NodeFilter.SHOW_TEXT))
 
     if @offsetDiffersBetween(@selection, range)
       @selection.removeAllRanges()

data/lib/written/app/assets/javascripts/written/core/document.coffee

@@ -1,13 +1,16 @@
 #= require ../parsers/parsers
 
 class Written.Document
-  constructor: (textContent, parsers) ->
-    @markdown = textContent
-
-    @blocks = parsers.block.parse(textContent.split('\n').reverse())
+  constructor: (text, parsers) ->
+    @blocks = parsers.parse(parsers.blocks, text)
 
     @blocks.forEach (block) =>
-      block.processContent(parsers.inline.parse.bind(parsers.inline))
+      if block.text?
+        if block.multiline
+          block.content = block.text().split('\n').map (text) ->
+            parsers.parse(parsers.inlines, text)
+        else
+          block.content = parsers.parse(parsers.inlines, block.text())
 
   freeze: =>
     Object.freeze(@blocks)
@@ -21,5 +24,35 @@ class Written.Document
 
     text
 
+  applyTo: (content) =>
+
+    for block, index in @blocks
+      remaining = Array.prototype.slice.call(content.children, index)
+      element = remaining[0]
+      node = @findNodeFor(block, remaining)
+
+      content.insertBefore(node, element)
+
+    elements = Array.prototype.slice.call(content.children, index)
+    for element in elements
+      element.remove()
+
+    @cursor.focus()
+
+  findNodeFor: (block, remaining) ->
+    node = block.markdown()
+
+    found = remaining.find (existing) ->
+      block.equals(existing, node)
+
+    found || node
+
   toString: =>
-    @markdown
+    if @toString.cache?
+      return @toString.cache
+
+    texts = @blocks.map (block) ->
+      block.raw()
+
+    texts.join('\n')
+

data/lib/written/app/assets/javascripts/written/parsers/block/code.coffee

@@ -1,5 +1,4 @@
 class Code
-  @parserName: 'Code'
   multiline: true
 
   constructor: (match) ->
@@ -8,6 +7,11 @@ class Code
     @opened = true
 
 
+  raw: ->
+    texts = @matches.map (m) ->
+      m[0]
+    texts.join('\n')
+
   accepts: (text) ->
     @opened
 
@@ -17,17 +21,17 @@ class Code
       @matches.push(match)
       @opened = false
     else
+      @matches.push([text])
       @content += text + "\n"
 
     @content
 
-  processContent: (callback) =>
 
-  identical: (current, rendered) ->
+  equals: (current, rendered) ->
     current.outerHTML == rendered.outerHTML
 
   markdown: =>
-    node = "<pre is='written-pre'><code></code></pre>".toHTML()
+    node = "<pre><code></code></pre>".toHTML()
     code = node.querySelector('code')
 
     if @matches[0][3]?
@@ -39,7 +43,7 @@ class Code
 
     code.insertAdjacentHTML('afterbegin', @matches[0][0])
     if !@opened
-      code.insertAdjacentHTML('beforeend', @matches[1][0])
+      code.insertAdjacentHTML('beforeend', @matches[@matches.length - 1][0])
 
     node
 
@@ -59,33 +63,33 @@ class Code
 
 Code.rule = /^((~{3})([a-z]+)?)(?:\s(.*))?/i
 
-Written.Parsers.Block.register Code
-
-prototype = Object.create(HTMLPreElement.prototype)
+Written.Parsers.register {
+  parser: Code
+  node: 'pre'
+  type: 'block'
+  getRange: (node, offset, walker) ->
+    range = document.createRange()
 
-prototype.getRange = (offset, walker) ->
-  range = document.createRange()
+    if !node.firstChild?
+      range.setStart(node, 0)
+    else
+      while walker.nextNode()
+        if walker.currentNode.length < offset
+          offset -= walker.currentNode.length
+          continue
 
-  if !@firstChild?
-    range.setStart(this, 0)
-  else
-    while walker.nextNode()
-      if walker.currentNode.length < offset
-        offset -= walker.currentNode.length
-        continue
+        range.setStart(walker.currentNode, offset)
+        break
 
-      range.setStart(walker.currentNode, offset)
-      break
+    range.collapse(true)
+    range
 
-  range.collapse(true)
-  range
-prototype.toString = ->
-  if @textContent[@textContent.length - 1] == '\n'
-    @textContent.substr(0, @textContent.length - 1)
-  else
-    @textContent
+  toString: (node) ->
+    if node.textContent[node.textContent.length - 1] == '\n'
+      node.textContent.substr(0, node.textContent.length - 1)
+    else
+      node.textContent
 
-document.registerElement('written-pre', {
-  prototype: prototype
-  extends: 'pre'
-})
+  highlightWith: (callback) ->
+    Code.prototype.highlight = callback
+}

data/lib/written/app/assets/javascripts/written/parsers/block/heading.coffee

@@ -1,22 +1,21 @@
 class Header
-  @parserName: 'Header'
   multiline: false
 
   constructor: (match) ->
     @match = match
 
-  processContent: (callback) =>
-    if @content?
-      throw "Content Error: The content was already processed"
-      return
+  equals: (current, rendered) ->
+    current.outerHTML == rendered.outerHTML
 
-    @content = callback(@match[3])
+  text: ->
+    @match[3]
 
-  identical: (current, rendered) ->
-    current.outerHTML == rendered.outerHTML
+  raw: ->
+    @match[0]
 
   markdown: =>
-    node = "<h#{@match[2].length} is='written-h#{@match[2].length}'>".toHTML()
+    node = "<h#{@match[2].length}>".toHTML()
+
     for text in @content
       if text.markdown?
         node.appendChild(text.markdown())
@@ -37,30 +36,29 @@ class Header
 
 Header.rule = /^((#{1,6})\s)(.*)$/i
 
-Written.Parsers.Block.register Header
 
 [1,2,3,4,5,6].forEach (size) ->
-  prototype = Object.create(HTMLHeadingElement.prototype)
-  prototype.getRange = (offset, walker) ->
-    range = document.createRange()
+  Written.Parsers.register {
+    parser: Header
+    node: "h#{size}"
+    type: 'block'
+    getRange: (node, offset, walker) ->
+      range = document.createRange()
 
-    if !@firstChild?
-      range.setStart(this, 0)
-    else
-      while walker.nextNode()
-        if walker.currentNode.length < offset
-          offset -= walker.currentNode.length
-          continue
+      if !node.firstChild?
+        range.setStart(node, 0)
+      else
+        while walker.nextNode()
+          if walker.currentNode.length < offset
+            offset -= walker.currentNode.length
+            continue
 
-        range.setStart(walker.currentNode, offset)
-        break
+          range.setStart(walker.currentNode, offset)
+          break
 
-    range.collapse(true)
-    range
-  prototype.toString = ->
-    @textContent
+      range.collapse(true)
+      range
 
-  document.registerElement("written-h#{size}", {
-    prototype: prototype
-    extends: "h#{size}"
-  })
+    toString: (node) ->
+      node.textContent
+  }

data/lib/written/app/assets/javascripts/written/parsers/block/image.coffee

@@ -1,36 +1,24 @@
 class Image
-  @parserName: 'Image'
   multiline: false
 
   constructor: (match) ->
     @match = match
 
-  processContent: (callback) =>
-    if @content?
-      throw "Content Error: The content was already processed"
-      return
+  raw: ->
+    @match[0]
 
-    @content = callback(@match[2])
+  text: ->
+    @match[2]
 
-  identical: (current, rendered) ->
-
-    sameNode = (current, rendered) ->
-      current.nodeName == rendered.nodeName
-
-    sameImages = (current, rendered) ->
-      (current? && current.dataset.image) == (rendered? && rendered.dataset.image)
-
-    sameTexts = (current, rendered) ->
-      (current? && current.innerHTML) == (rendered? && rendered.innerHTML)
-
-
-    sameNode(current, rendered) &&
-    sameImages(current.querySelector('img'), rendered.querySelector('img')) &&
-    sameTexts(current.querySelector('figcaption'), rendered.querySelector('figcaption'))
+  equals: (current, rendered) ->
+    figcaption = current.querySelector('figcaption') || {}
+    img = current.querySelector('img') || {}
 
+    rendered.querySelector('figcaption').outerHTML == figcaption.outerHTML &&
+    rendered.querySelector('img').src == img.src
 
   markdown: =>
-    figure = "<figure is='written-figure'><div contenteditable='false'><div class='progress'></div><input type='file' /><img/></div><figcaption /></figure>".toHTML()
+    figure = "<figure><div contenteditable='false'><input type='file' /><img/></div><figcaption /></figure>".toHTML()
     caption = figure.querySelector('figcaption')
     container = figure.querySelector('div')
 
@@ -47,7 +35,6 @@ class Image
     img = figure.querySelector('img')
     if @match[4]?
       img.src = img.dataset.image = @match[4]
-      img.onerror = @placeholder.bind(this, img, true)
     else
       img.src = '/assets/written/placeholder.png'
 
@@ -74,40 +61,34 @@ class Image
   placeholder: (img, event, onerror = false) =>
     img.src = '/assets/written/placeholder.png'
     img.onerror = undefined
-    if onerror
-      img.classList.add 'error'
 
 Image.rule = /^(!{1}\[([^\]]*)\])(\(([^\s]*)?\))$/i
 
 Image.uploader = (uploader) ->
   Image::configure = uploader.initialize
 
-Written.Parsers.Block.register Image
 
-prototype = Object.create(HTMLElement.prototype)
+Written.Parsers.register {
+  parser: Image
+  node: 'figure'
+  type: 'block'
+  getRange: (node, offset, walker) ->
+    range = document.createRange()
 
-prototype.getRange = (offset, walker) ->
-  range = document.createRange()
-
-  if !@firstChild?
-    range.setStart(this, 0)
-  else
-    while walker.nextNode()
-      if walker.currentNode.length < offset
-        offset -= walker.currentNode.length
-        continue
-
-      range.setStart(walker.currentNode, offset)
-      break
-
-  range.collapse(true)
-  range
+    if !node.firstChild?
+      range.setStart(this, 0)
+    else
+      while walker.nextNode()
+        if walker.currentNode.length < offset
+          offset -= walker.currentNode.length
+          continue
 
-prototype.toString = ->
-  (@querySelector('figcaption') || this).textContent
+        range.setStart(walker.currentNode, offset)
+        break
 
-document.registerElement('written-figure', {
-  prototype: prototype
-  extends: 'figure'
-})
+    range.collapse(true)
+    range
 
+  toString: (node) ->
+    (node.querySelector('figcaption') || node).textContent
+}

data/lib/written/app/assets/javascripts/written/parsers/block/olist.coffee

@@ -1,5 +1,4 @@
 class OList
-  @parserName: 'OList'
   multiline: true
 
   constructor: (match) ->
@@ -14,23 +13,25 @@ class OList
   append: (text) ->
     @matches.push(OList.rule.exec(text))
 
-  processContent: (callback) =>
-    if @content?
-      throw "Content Error: The content was already processed"
-      return
+  equals: (current, rendered) ->
+    current.outerHTML == rendered.outerHTML
+
+  raw: ->
+    texts = @matches.map (match) ->
+      match[0]
+
+    texts.join('\n')
 
-    lines = @matches.map (match) ->
+  text: ->
+    texts = @matches.map (match) ->
       match[2]
-    
-    @content = callback(lines)
 
-  identical: (current, rendered) ->
-    current.outerHTML == rendered.outerHTML
+    texts.join('\n')
 
   markdown: =>
-    node = "<ol is='written-ol'></ol>".toHTML()
+    node = "<ol></ol>".toHTML()
     for line, index in @content
-      li = "<li is='written-li'>".toHTML()
+      li = "<li>".toHTML()
       li.appendChild(document.createTextNode(@matches[index][1]))
 
       for text in line
@@ -61,41 +62,37 @@ class OList
 
 OList.rule = /^(\d+\.\s)(.*)/i
 
-Written.Parsers.Block.register OList
-
-prototype = Object.create(HTMLOListElement.prototype)
-
-prototype.toString = ->
-  texts = Array.prototype.slice.call(@children).map (li) ->
-    li.toString()
-  texts.join("\n")
-
-prototype.getRange = (offset, walker) ->
-  range = document.createRange()
-  if !@firstChild?
-    range.setStart(this, 0)
-    return
-
-  li = this.firstElementChild
-
-  while walker.nextNode()
-    if !li.contains(walker.currentNode)
-      newList = walker.currentNode
-      while newList? && !(newList instanceof HTMLLIElement)
-        newList = newList.parentElement
-      li = newList
-      offset--
-
-    if walker.currentNode.length < offset
-      offset -= walker.currentNode.length
-      continue
-    range.setStart(walker.currentNode, offset)
-    break
-
-  range.collapse(true)
-  range
+Written.Parsers.register {
+  parser: OList
+  node: 'ol'
+  type: 'block'
+  getRange: (node, offset, walker) ->
+    range = document.createRange()
+    if !node.firstChild?
+      range.setStart(node, 0)
+      return
 
-document.registerElement('written-ol', {
-  prototype: prototype
-  extends: 'ol'
-})
+    li = node.firstElementChild
+
+    while walker.nextNode()
+      if !li.contains(walker.currentNode)
+        newList = walker.currentNode
+        while newList? && !(newList instanceof HTMLLIElement)
+          newList = newList.parentElement
+        li = newList
+        offset--
+
+      if walker.currentNode.length < offset
+        offset -= walker.currentNode.length
+        continue
+      range.setStart(walker.currentNode, offset)
+      break
+
+    range.collapse(true)
+    range
+
+  toString: (node) ->
+    texts = Array.prototype.slice.call(node.children).map (li) ->
+      li.textContent
+    texts.join("\n")
+}