written 0.2.0 → 0.4.0

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

@@ -1,4 +1,5 @@
-class Quote
+RULE = /^(>\s)(.*)/i
+class Quote extends Written.Parsers.Block
   multiline: true
 
   constructor: (match) ->
@@ -6,18 +7,18 @@ class Quote
     @opened = true
 
   accepts: (text) ->
-    @opened = Quote.rule.test(text)
+    @opened = RULE.test(text)
 
   append: (text) ->
-    @matches.push(Quote.rule.exec(text))
+    @matches.push(RULE.exec(text))
 
-  raw: ->
+  outerText: ->
     lines = @matches.map (match) ->
       match[0]
 
     lines.join('\n')
 
-  text: =>
+  innerText: =>
     lines = @matches.map (match) ->
       match[2]
 
@@ -26,15 +27,15 @@ class Quote
   equals: (current, rendered) ->
     current.outerHTML == rendered.outerHTML
 
-  markdown: =>
-    node = "<blockquote></blockquote>".toHTML()
+  toEditor: =>
+    node = Written.toHTML("<blockquote></blockquote>")
     for line, index in @content
-      p = "<p>".toHTML()
+      p = Written.toHTML("<p>")
       p.appendChild(document.createTextNode(@matches[index][1]))
 
       for text in line
-        if text.markdown?
-          p.appendChild(text.markdown())
+        if text.toEditor?
+          p.appendChild(text.toEditor())
         else
           p.appendChild(document.createTextNode(text.toString()))
 
@@ -44,14 +45,14 @@ class Quote
 
     node
 
-  html: =>
-    node = "<blockquote></blockquote>".toHTML()
+  toHTML: =>
+    node = Written.toHTML("<blockquote></blockquote>")
     for line, index in @content
-      p = "<p>".toHTML()
+      p = Written.toHTML("<p>")
 
       for text in line
-        if text.html?
-          p.appendChild(text.html())
+        if text.toHTML?
+          p.appendChild(text.toHTML())
         else
           p.appendChild(document.createTextNode(text.toString()))
 
@@ -62,30 +63,10 @@ class Quote
     node
 
 
-Quote.rule = /^(>\s)(.*)/i
-
 Written.Parsers.register {
   parser: Quote
-  node: 'blockquote'
+  name: 'quote'
+  nodes: ['blockquote']
   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
-
-  toString: (node) ->
-    node.textContent
-
+  rule: RULE
 }

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

@@ -1,41 +1,43 @@
-class UList
+RULE = /^(-\s)(.*)/i
+
+class UList extends Written.Parsers.Block
   multiline: true
 
   constructor: (match) ->
     @matches = [match]
 
   accepts: (text) ->
-    @opened = UList.rule.test(text)
+    @opened = RULE.test(text)
 
     @opened
 
-  raw: ->
+  outerText: ->
     texts = @matches.map (match) ->
       match[0]
 
     texts.join('\n')
 
-  text: ->
+  innerText: ->
     texts = @matches.map (match) ->
       match[2]
 
     texts.join('\n')
 
   append: (text) ->
-    @matches.push(UList.rule.exec(text))
+    @matches.push(RULE.exec(text))
 
   equals: (current, rendered) ->
     current.outerHTML == rendered.outerHTML
 
-  markdown: =>
-    node = "<ul></ul>".toHTML()
+  toEditor: =>
+    node = Written.toHTML("<ul></ul>")
     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()))
 
@@ -43,14 +45,14 @@ class UList
 
     node
 
-  html: =>
-    node = "<ul></ul>".toHTML()
+  toHTML: =>
+    node = Written.toHTML("<ul></ul>")
     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()))
 
@@ -58,12 +60,12 @@ class UList
 
     node
 
-UList.rule = /^(-\s)(.*)/i
-
 Written.Parsers.register {
   parser: UList
-  node: 'ul'
+  name: 'ulist'
+  nodes: ['ul']
   type: 'block'
+  rule: RULE
   getRange: (node, offset, walker) ->
     range = document.createRange()
     if !node.firstChild?

data/lib/written/app/assets/javascripts/written/parsers/inline/bold.coffee

@@ -0,0 +1,23 @@
+class Bold extends Written.Parsers.Inline
+  constructor: (match) ->
+    @match = match
+
+  index: =>
+    @match.index
+
+  length: =>
+    @match[0].length
+
+  toEditor: =>
+    Written.toHTML("<strong>#{@match[0]}</strong>")
+
+  toHTML: =>
+    Written.toHTML("<strong>#{@match[3]}</strong>")
+
+Written.Parsers.register {
+  parser: Bold
+  name: 'bold'
+  nodes: ['strong']
+  type: 'inline'
+  rule: /((\*{1})([^\*]+)(\*{1}))/gi
+}

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

@@ -1,4 +1,4 @@
-class Code
+class Code extends Written.Parsers.Inline
   constructor: (match) ->
     @match = match
 
@@ -8,8 +8,8 @@ class Code
   length: =>
     @match[0].length
 
-  markdown: =>
-    node = "<code>#{this.match[0]}</code>".toHTML()
+  toEditor: =>
+    node = Written.toHTML("<code>#{this.match[0]}</code>")
     if @match[3]?
       node.classList.add("language-#{@match[3]}")
 
@@ -17,40 +17,21 @@ class Code
       @highlight(node)
     node
 
-  html: =>
-    node = "<code>#{this.match[4]}</code>".toHTML()
+  toHTML: =>
+    node = Written.toHTML("<code>#{this.match[4]}</code>")
     if @match[3]?
       node.classList.add("language-#{@match[3]}")
 
     node
 
 
-Code.rule = /((~{3})([a-z]+)?)\s(.+)?(~{3})/gi
 
 Written.Parsers.register {
   parser: Code
-  node: 'code'
+  name: 'code'
+  nodes: ['code']
   type: 'inline'
-  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
-
-        range.setStart(walker.currentNode, offset)
-        break
-
-    range.collapse(true)
-    range
-
-  toString: (node) ->
-    node.textContent
-
+  rule: /((~{3})([a-z]+)?)\s(.+)?(~{3})/gi
   highlightWith: (callback) ->
     Code.prototype.highlight = callback
 }

data/lib/written/app/assets/javascripts/written/parsers/inline/italic.coffee

@@ -1,4 +1,4 @@
-class Italic
+class Italic extends Written.Parsers.Inline
   constructor: (match) ->
     @match = match
 
@@ -8,36 +8,16 @@ class Italic
   length: =>
     @match[0].length
 
-  markdown: =>
-    "<em>#{this.match[1]}</em>".toHTML()
-
-  html: ->
-    "<em>#{this.match[3]}</em>".toHTML()
-
-Italic.rule = /((_{1})([^_]+)(_{1}))/gi
+  toEditor: =>
+    Written.toHTML("<em>#{this.match[1]}</em>")
 
+  toHTML: ->
+    Written.toHTML("<em>#{this.match[3]}</em>")
 
 Written.Parsers.register {
   parser: Italic
-  node: 'em'
+  name: 'italic'
+  nodes: ['em']
   type: 'inline'
-  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
-
-  toString: (node) ->
-    node.textContent
+  rule: /((_{1})([^_]+)(_{1}))/gi
 }

data/lib/written/app/assets/javascripts/written/parsers/inline/link.coffee

@@ -1,4 +1,4 @@
-class Link
+class Link extends Written.Parsers.Inline
   constructor: (match) ->
     @match = match
 
@@ -8,36 +8,17 @@ class Link
   length: =>
     @match[0].length
 
-  markdown: =>
-    "<a href='javascript:void(0)'><strong>#{@match[1]}</strong>#{@match[3]}</a>".toHTML()
+  toEditor: =>
+    Written.toHTML("<a><strong>#{@match[1]}</strong>#{@match[3]}</a>")
 
-  html: =>
-    "<a href='#{@match[4]}'>#{@match[2]}</a>".toHTML()
-
-Link.rule = /!{0}(\[([^\]]+)\])(\(([^\)]+)\))/gi
+  toHTML: =>
+    Written.toHTML("<a href='#{@match[4]}'>#{@match[2]}</a>")
 
 
 Written.Parsers.register {
   parser: Link
-  node: 'a'
+  name: 'link'
+  nodes: ['a']
   type: 'inline'
-  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
-
-  toString: (node) ->
-    node.textContent
+  rule: /!{0}(\[([^\]]+)\])(\(([^\)]+)\))/gi
 }

data/lib/written/app/assets/stylesheets/written.scss

@@ -3,6 +3,10 @@
   white-space: pre-wrap;
   padding: 1em;
 
+  a {
+    color: steelblue;
+  }
+
   p {
     min-height: 1.2em;
   }

data/lib/written/version.rb

@@ -1,3 +1,3 @@
 module Written
-  VERSION = '0.2.0'
+  VERSION = '0.4.0'
 end

data/package.json

@@ -0,0 +1,25 @@
+{
+  "name": "written",
+  "description": "Markdown Editor",
+  "version": "0.0.1",
+  "private": true,
+  "scripts": {
+    "test": "jest"
+  },
+  "devDependencies": {
+    "babel-jest": "^12.1.0",
+    "babel-polyfill": "^6.9.0",
+    "babel-preset-es2015": "^6.9.0",
+    "coffee-script": "^1.10.0",
+    "jest": "^12.1.1",
+    "jest-cli": "^12.1.0"
+  },
+  "jest": {
+    "testDirectoryName": "test/javascript",
+    "scriptPreprocessor": "<rootDir>/compile-coffee",
+    "moduleFileExtensions": [
+      "coffee",
+      "js"
+    ]
+  }
+}

data/test/javascript/parsers/block/code.js

@@ -0,0 +1,58 @@
+let struct = undefined;
+
+window.Written = {
+  Parsers: {
+    Block: {},
+    register: function(s) {
+      struct = s
+    }
+  }
+}
+
+require('../../../../lib/written/app/assets/javascripts/written/core/html')
+require('../../../../lib/written/app/assets/javascripts/written/parsers/block/code')
+
+describe('code', () => {
+  it('detects a match', () => {
+    let match = struct.rule.exec('~~~')
+    expect(match).not.toBeNull()
+  })
+
+  it('can add lines until it finds the closing tag', () => {
+    let match = struct.rule.exec('~~~')
+    let parser = new struct.parser(match)
+
+    expect(match).not.toBeNull()
+    expect(parser.accepts('let var = true')).toBeTruthy()
+    parser.append('let var = true')
+
+    expect(parser.accepts('~~~')).toBeTruthy()
+    parser.append('~~~')
+
+    expect(parser.opened).toBeFalsy()
+  })
+
+  it('returns the content for the editor', () => {
+    let match = struct.rule.exec('~~~')
+    let html = Written.toHTML('<pre><code>~~~\nlet var = true\n~~~</code></pre>')
+
+    let parser = new struct.parser(match)
+    parser.append('let var = true')
+    parser.append('~~~')
+
+    expect(parser.opened).toBeFalsy()
+    expect(parser.toEditor().outerHTML).toBe(html.outerHTML)
+  })
+
+  it('HTML content should not include the markdown syntax', () => {
+    let match = struct.rule.exec('~~~')
+    let html = Written.toHTML('<pre><code>\nlet var = true\n</code></pre>')
+
+    let parser = new struct.parser(match)
+    parser.append('let var = true')
+    parser.append('~~~')
+
+    expect(parser.opened).toBeFalsy()
+    expect(parser.toHTML().outerHTML).toBe(html.outerHTML)
+  })
+})