written 0.2.0 → 0.4.0

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

@@ -1,4 +1,4 @@
-class Code
+class Code extends Written.Parsers.Block
   multiline: true
 
   constructor: (match) ->
@@ -7,7 +7,7 @@ class Code
     @opened = true
 
 
-  raw: ->
+  outerText: ->
     texts = @matches.map (m) ->
       m[0]
     texts.join('\n')
@@ -16,7 +16,7 @@ class Code
     @opened
 
   append: (text) ->
-    match = /(~{3})$/i.exec(text)
+    match = /^(~{3})$/i.exec(text)
     if match?
       @matches.push(match)
       @opened = false
@@ -30,8 +30,8 @@ class Code
   equals: (current, rendered) ->
     current.outerHTML == rendered.outerHTML
 
-  markdown: =>
-    node = "<pre><code></code></pre>".toHTML()
+  toEditor: =>
+    node = Written.toHTML("<pre><code></code></pre>")
     code = node.querySelector('code')
 
     if @matches[0][3]?
@@ -47,8 +47,8 @@ class Code
 
     node
 
-  html: =>
-    node = "<pre><code></code></pre>".toHTML()
+  toHTML: =>
+    node = Written.toHTML("<pre><code></code></pre>")
     code = node.querySelector('code')
 
     if @matches[0][3]?
@@ -57,33 +57,16 @@ class Code
     if @matches[0][4]?
       code.insertAdjacentHTML('beforebegin', "<header>#{@matches[0][4]}</header>")
 
-    code.appendChild(document.createTextNode(@content))
+    code.appendChild(document.createTextNode(@content.slice(1, -1)))
 
     node
 
-Code.rule = /^((~{3})([a-z]+)?)(?:\s(.*))?/i
-
 Written.Parsers.register {
   parser: Code
-  node: 'pre'
+  name: 'code'
+  nodes: ['pre']
   type: 'block'
-  getRange: (node, 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
-
-        range.setStart(walker.currentNode, offset)
-        break
-
-    range.collapse(true)
-    range
-
+  rule: /^((~{3})([a-z]+)?)(?:\s(.*))?/i
   toString: (node) ->
     if node.textContent[node.textContent.length - 1] == '\n'
       node.textContent.substr(0, node.textContent.length - 1)

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

@@ -1,4 +1,4 @@
-class Header
+class Header extends Written.Parsers.Block
   multiline: false
 
   constructor: (match) ->
@@ -7,58 +7,56 @@ class Header
   equals: (current, rendered) ->
     current.outerHTML == rendered.outerHTML
 
-  text: ->
+  innerText: ->
     @match[3]
 
-  raw: ->
+  outerText: ->
     @match[0]
 
-  markdown: =>
-    node = "<h#{@match[2].length}>".toHTML()
+  toEditor: =>
+    node = Written.toHTML("<h#{@match[2].length}>")
 
     for text in @content
-      if text.markdown?
-        node.appendChild(text.markdown())
+      if text.toEditor?
+        node.appendChild(text.toEditor())
       else
         node.appendChild(document.createTextNode(text))
 
     node.insertAdjacentHTML('afterbegin', @match[1])
     node
 
-  html: =>
-    node = "<h#{@match[2].length}>".toHTML()
+  toHTML: =>
+    node = Written.toHTML("<h#{@match[2].length}>")
     for text in @content
-      if text.html?
-        node.appendChild(text.html())
+      if text.toHTML?
+        node.appendChild(text.toHTML())
       else
         node.appendChild(document.createTextNode(text))
     node
 
-Header.rule = /^((#{1,6})\s)(.*)$/i
-
-
-[1,2,3,4,5,6].forEach (size) ->
-  Written.Parsers.register {
-    parser: Header
-    node: "h#{size}"
-    type: 'block'
-    getRange: (node, 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
-
-          range.setStart(walker.currentNode, offset)
-          break
-
-      range.collapse(true)
-      range
-
-    toString: (node) ->
-      node.textContent
-  }
+Written.Parsers.register {
+  parser: Header
+  name: 'header'
+  nodes: ['h1', 'h2', 'h3', 'h4', 'h5', 'h6']
+  type: 'block'
+  rule: /^((#{1,6})\s)(.*)$/i
+  getRange: (node, 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
+
+        range.setStart(walker.currentNode, offset)
+        break
+
+    range.collapse(true)
+    range
+
+  toString: (node) ->
+    node.textContent
+}

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

@@ -1,13 +1,13 @@
-class Image
+class Image extends Written.Parsers.Block
   multiline: false
 
   constructor: (match) ->
     @match = match
 
-  raw: ->
+  outerText: ->
     @match[0]
 
-  text: ->
+  innerText: ->
     @match[2]
 
   equals: (current, rendered) ->
@@ -17,14 +17,14 @@ class Image
     rendered.querySelector('figcaption').outerHTML == figcaption.outerHTML &&
     rendered.querySelector('img').src == img.src
 
-  markdown: =>
-    figure = "<figure><div contenteditable='false'><img/></div><figcaption /></figure>".toHTML()
+  toEditor: =>
+    figure = Written.toHTML("<figure><div contenteditable='false'><img/></div><figcaption /></figure>")
     caption = figure.querySelector('figcaption')
     container = figure.querySelector('div')
 
     for text in @content
-      if text.markdown?
-        caption.appendChild(text.markdown())
+      if text.toEditor?
+        caption.appendChild(text.toEditor())
       else
         caption.appendChild(document.createTextNode(text))
 
@@ -34,25 +34,22 @@ class Image
 
     img = figure.querySelector('img')
     if @match[4]?
-      img.src = img.dataset.image = @match[4]
+      img.src = @match[4]
     else
       img.src = '/assets/written/placeholder.png'
 
-    if @configure?
-      @configure(figure)
-
     figure
 
-  html: ->
-    figure = "<figure><div><img/></div><figcaption /></figure>".toHTML()
+  toHTML: ->
+    figure = Written.toHTML("<figure><img/><figcaption /></figure>")
     img = figure.querySelector('img')
     caption = figure.querySelector('figcaption')
 
     img.src = @match[4]
 
     for text in @content
-      if text.html?
-        caption.appendChild(text.html())
+      if text.toHTML?
+        caption.appendChild(text.toHTML())
       else
         caption.appendChild(document.createTextNode(text))
 
@@ -62,33 +59,12 @@ class Image
     img.src = '/assets/written/placeholder.png'
     img.onerror = undefined
 
-Image.rule = /^(!{1}\[([^\]]*)\])(\(([^\s]*)?\))$/i
-
-Image.uploader = (uploader) ->
-  Image::configure = uploader.initialize
-
-
 Written.Parsers.register {
   parser: Image
-  node: 'figure'
+  name: 'image'
+  nodes: ['figure']
   type: 'block'
-  getRange: (node, offset, walker) ->
-    range = document.createRange()
-
-    if !node.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
-
+  rule: /^(!{1}\[([^\]]*)\])(\(([^\s]*)?\))$/i
   toString: (node) ->
     (node.querySelector('figcaption') || node).textContent
 }

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

@@ -1,4 +1,6 @@
-class OList
+RULE = /^(\d+\.\s)(.*)/i
+
+class OList extends Written.Parsers.Block
   multiline: true
 
   constructor: (match) ->
@@ -6,37 +8,38 @@ class OList
     @opened = true
 
   accepts: (text) ->
-    @opened = OList.rule.test(text)
+    @opened = RULE.test(text)
 
     @opened
 
   append: (text) ->
-    @matches.push(OList.rule.exec(text))
+    @matches.push(RULE.exec(text))
 
   equals: (current, rendered) ->
     current.outerHTML == rendered.outerHTML
 
-  raw: ->
+  innerText: ->
     texts = @matches.map (match) ->
-      match[0]
+      match[2]
 
     texts.join('\n')
 
-  text: ->
+  outerText: ->
     texts = @matches.map (match) ->
-      match[2]
+      match[0]
 
     texts.join('\n')
 
-  markdown: =>
-    node = "<ol></ol>".toHTML()
+
+  toEditor: =>
+    node = Written.toHTML("<ol></ol>")
     for line, index in @content
-      li = "<li>".toHTML()
+      li = Written.toHTML("<li>")
       li.appendChild(document.createTextNode(@matches[index][1]))
 
       for text in line
-        if text.markdown?
-          li.appendChild(text.markdown())
+        if text.toEditor?
+          li.appendChild(text.toEditor())
         else
           li.appendChild(document.createTextNode(text.toString()))
 
@@ -44,14 +47,14 @@ class OList
 
     node
 
-  html: =>
-    node = "<ol></ol>".toHTML()
+  toHTML: =>
+    node = Written.toHTML("<ol></ol>")
     for line, index in @content
-      li = "<li>".toHTML()
+      li = Written.toHTML("<li>")
 
       for text in line
-        if text.html?
-          li.appendChild(text.html())
+        if text.toHTML?
+          li.appendChild(text.toHTML())
         else
           li.appendChild(document.createTextNode(text.toString()))
 
@@ -60,12 +63,12 @@ class OList
     node
 
 
-OList.rule = /^(\d+\.\s)(.*)/i
-
 Written.Parsers.register {
   parser: OList
-  node: 'ol'
+  name: 'olist'
+  nodes: ['ol']
   type: 'block'
+  rule: RULE
   getRange: (node, offset, walker) ->
     range = document.createRange()
     if !node.firstChild?

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

@@ -1,4 +1,4 @@
-class Paragraph
+class Paragraph extends Written.Parsers.Block
   multiline: false
 
   constructor: (match) ->
@@ -7,27 +7,27 @@ class Paragraph
   equals: (current, rendered) ->
     current.outerHTML == rendered.outerHTML
 
-  text: =>
+  innerText: =>
     @match[0]
 
-  raw: =>
+  outerText: =>
     @match[0]
 
-  markdown: =>
-    node = "<p>".toHTML()
+  toEditor: =>
+    node = Written.toHTML("<p>")
     for text in @content
-      if text.markdown?
-        node.appendChild(text.markdown())
+      if text.toEditor?
+        node.appendChild(text.toEditor())
       else
         node.appendChild(document.createTextNode(text))
 
     node
 
-  html: =>
-    node = "<p>".toHTML()
+  toHTML: =>
+    node = Written.toHTML("<p>")
     for text in @content
-      if text.html?
-        node.appendChild(text.html())
+      if text.toHTML?
+        node.appendChild(text.toHTML())
       else
         node.appendChild(document.createTextNode(text))
 
@@ -35,31 +35,11 @@ class Paragraph
 
 
 
-Paragraph.rule = /.*/i
-
 Written.Parsers.register {
   parser: Paragraph
-  node: 'p'
+  name: 'paragraph'
+  nodes: ['p']
   type: 'block'
+  rule: /.*/i
   default: true
-  getRange: (node, 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
-
-        range.setStart(walker.currentNode, offset)
-        break
-
-    range.collapse(true)
-    range
-
-  toString: (node) ->
-    node.textContent
-
 }