ecrire 0.26.3 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42ebfbcd7b234a8ed0eced636045769471049b42
-  data.tar.gz: fcf2461eb398ad52f848e08f4be8d2a8975ef354
+  metadata.gz: 6ba5385d6716080f7627c1fca5a2a6402f86a0d3
+  data.tar.gz: 8da73ff93cd99d67cce527fe12e826a19bdceb12
 SHA512:
-  metadata.gz: 5fc4670039672091e34e0055e400063b5715c95f39375efc770f528d32d09435aff6cccc141be01e901d99cd9ba40aa05c4aebbc4ba9c76e04048eceace9c07d
-  data.tar.gz: 633ca19d3ad1b9d88a3da8f8419c737cd89b0750ea423b19a92de5593f98c0ce48668b523db7b2ccf04d3afc609e33411caa3b9eb47ff83bd3ec407e42d62d4f
+  metadata.gz: dfe75295b9fd1430d0d5a6e35486c0f928c81f695da95dac37810386daa8db00a7077e88de1c6e0495ffa707d159f1bda1783dc1b9b6e76a759455c749fc6ed2
+  data.tar.gz: 89a2986375f70b026f629647ac4a2f8fa84400c37432bc4fe97fb9c48ef475753cc9d2d321ead18b634638001f2adaa1599d2d3067af3a17ce770bbcbda58748

data/.gitignore

@@ -15,7 +15,9 @@
 log
 tmp
 
+Dockerfile
+docker-compose.yml
 .DS_Store
 Gemfile.lock
 
-secrets.yml
+/lib/ecrire/template/secrets.yml

data/bin/ecrire

@@ -21,6 +21,10 @@ parser = OptionParser.new do |opts|
     options[:Port] = port
   end
 
+  opts.on '-b IP', '--binding=IP', "Binds Rails to the specified IP.", "Default: localhost" do |ip|
+    options[:Host] = ip
+  end
+
   opts.separator ''
   opts.separator 'ecrire console'
 

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

@@ -3,7 +3,7 @@ ObserveJS.bind 'Editor.Content', class @Editor
   loaded: =>
     @on 'keydown', @linefeed
 
-    @parsers = Editor.Parsers
+    @parsers = Editor.Parsers.sort()
 
     @extensions = Editor.Extensions.map (ext) =>
       new ext(this)
@@ -357,5 +357,23 @@ class Mutations
     else
       'none'
 
-Editor.Parsers = []
+class Parsers
+  constructor: ->
+    @store = {}
+
+  add: (name, kls) =>
+    @store[name] = kls
+
+  sort: =>
+    [
+      @store.lists
+      @store.code
+      @store.image
+      @store.headers
+      @store.link
+      @store.word
+    ]
+
+Editor.Parsers = new Parsers()
+
 Editor.Extensions = []

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

@@ -1,43 +1,97 @@
-Editor.Parsers.push class
-  rule: /^((~{3,})([a-z]+)?)(.+)?(~{3,}$)?/mi
+Editor.Parsers.add 'code', class
+  rules:
+    start: /((~{3,})([a-z]+)?)(.+)?/i
 
   constructor: (node) ->
-    @nodes = [node]
-    @tildeCount = 0
+    @walker = document.createTreeWalker(node, NodeFilter.SHOW_TEXT)
 
   isMatched: =>
-    @match = @rule.exec(@nodes[0].textContent)
-    if @match? && @match[0]?
-      @tildeCount = @match[2].length
-      @collectSiblingsUntilMatched(@tildeCount, @nodes[0])
+    @matches().length > 0 
 
-  collectSiblingsUntilMatched: (count, node) =>
-    node = node.nextSibling
+  matches: =>
+    matches = []
+    while node = @walker.nextNode()
+      match = @extract(node)
+      if match?
+        matches.push match
+        @walker.currentNode = match.contentNodes[match.contentNodes.length - 1]
+
+    @matches = ->
+      matches
+    @matches()
+
+  extract: (node) =>
+    match = @rules.start.exec(node.textContent)
+
+    if !match?
+      return null
+
+    return @split(match, node)
+
+  split: (match, node) ->
+    node = node.splitText(match.index)
+    match.contentNodes = [node]
+
+    if match.index > 0
+      match.inline = true
+
+    match.node = node
+    match.tildeCount = match[2].length
+    match.contentNodes.push node.splitText(match.tildeCount)
+
+    if m = @findCloseTag(match.contentNodes[1], match.tildeCount)
+      match.contentNodes[1].splitText(m.index + m[0].length)
+      match.closeNode = match.contentNodes[match.contentNodes.length - 1]
+
+    if match.closeNode?
+      match.inline = true
+      return match
+
+    node = @walker.root.nextSibling
     while node
-      @nodes.push node
-      nextNode = node.nextSibling
+
+      sibling = node.nextSibling
       node.remove()
 
-      match = @rule.exec(node.textContent)
+      textNode = document.createTextNode('\n' + node.textContent)
+      match.contentNodes.push textNode
 
-      if match? && match[2]? && match[2].length == count
+      if m = @findCloseTag(textNode, match.tildeCount)
+        match.closeNode = node
         break
 
-      node = nextNode
+      node = sibling
+
+    return match
+
+  findCloseTag: (node, tildeCount) =>
+    rule = new RegExp("(~{#{tildeCount},})", 'i')
+    rule.exec(node.textContent)
+
 
 
   render: =>
-    pre = "<pre>".toHTML()
-    code = "<code as='Editor.Code'>".toHTML()
+    root = @walker.root
+
+    for match in @matches()
+
+      code = "<code as='Editor.Code'>".toHTML()
+      match.node.parentElement.replaceChild(code, match.node)
+
+      if match.inline?
+        parent = match.node.parentElement
+
+      code.appendChild(line) for line in match.contentNodes
 
-    if @match[3]?
-      code.classList.add("language-#{@match[3]}")
 
-    texts = @nodes.map (n) -> n.textContent
+      if match[3]?
+        code.classList.add("language-#{match[3]}")
 
-    code.textContent = texts.join('\n')
+      Prism.highlightElement(code)
 
-    Prism.highlightElement(code)
-    pre.appendChild(code)
-    pre
+      if !match.inline?
+        pre = "<pre>".toHTML()
+        pre.appendChild(code)
+        root = pre
 
+    root

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

@@ -1,4 +1,4 @@
-Editor.Parsers.push class
+Editor.Parsers.add 'headers', class
   rule: /^(#{1,6}) /i
 
   constructor: (node) ->

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

@@ -1,4 +1,4 @@
-Editor.Parsers.push class
+Editor.Parsers.add 'image', class
   rule: /^(!{1}\[([^\]]+)\])(\(([^\s]+)?\))$/i
 
   constructor: (node) ->

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

@@ -1,4 +1,4 @@
-Editor.Parsers.push class
+Editor.Parsers.add 'link', class
   rule: /!{0}(\[([^\]]+)\])(\(([^\)]+)\))/gi
 
   constructor: (node, el) ->

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

@@ -1,4 +1,4 @@
-Editor.Parsers.push class
+Editor.Parsers.add 'lists', class
   rules: [
     {
       type: 'ul'

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

@@ -1,4 +1,4 @@
-Editor.Parsers.push class
+Editor.Parsers.add 'word', class
   rule: /((\*{1,2})[^\*]+(\*{1,2}))/gi
 
   constructor: (node, el) ->

data/lib/ecrire/app/assets/javascripts/admin/posts/header.coffee

@@ -9,8 +9,6 @@ ObserveJS.bind 'Post.Header', class
 
     @on 'ObserveJS:XHR:Failed', @failed
 
-    @on 'click', @retrieve('div.error.status').querySelector('button'), @clear
-
     @on 'images:create', @refresh
     @on 'images:destroy', @refresh
     @on 'titles:index', @popup
@@ -50,6 +48,7 @@ ObserveJS.bind 'Post.Header', class
     @hide(@retrieve('div.status.uploading'))
     @show(@retrieve('div.error.status'))
     ul = @retrieve('div.error.status').querySelector('ul')
+    @on 'click', @retrieve('div.error.status').querySelector('button'), @clear
     for error in errors
       ul.insertAdjacentHTML('beforeend', "<li>#{error}</li>")
 

data/lib/ecrire/app/assets/stylesheets/admin/base.css.scss

@@ -101,8 +101,8 @@ main {
 }
 
 .button {
-  @include transition(text-shadow 0.1s ease-in, border-color 0.1s, background-color 0.1s, box-shadow 0.1s, color 0.1s);
-  border: 1px solid darken($bright-blue, 15%);
+  @include transition(border-color 0.1s, background-color 0.1s, box-shadow 0.2s, color 0.1s);
+  border: 1px solid rgba(black, 0.25);
   border-radius: 2px;
   text-decoration: none;
   padding: 4px 8px;
@@ -110,26 +110,25 @@ main {
   font-size: 0.8em;
   text-transform: uppercase;
   font-weight: bold;
-  background-color: $bright-blue;
-
+  background-color: rgba(white, 0.05);
   color: lighten($navy-blue, 100%);
-  box-shadow: inset 0 1px 0 0 lighten($bright-blue, 15%);
+  box-shadow: inset 0 1px 0 0 transparent, 0 0 2px 0 transparent;
 
   &.selected {
-    background-color: darken($bright-blue, 15%);
-    border-color: darken($bright-blue, 25%);
+    background-color: rgba(black, 0.3);
+    border-color: rgba(black, 0.3);
     box-shadow: none;
   }
 
   &:hover:not(.selected) {
-    background-color: lighten($bright-blue, 5%);
-    color: lighten($navy-blue, 100%);
-    border-color: darken($bright-blue, 25%);
-    box-shadow: inset 0 1px 0 0 lighten($bright-blue, 15%), 0 0 2px 0 darken($bright-blue, 15%);
+    background-color: rgba(white, 0.05);
+    color: white;
+    border-color: rgba(black, 0.3);
+    box-shadow: inset 0 1px 0 0 rgba(white, 0.35), 0 0 2px 0 rgba(black, 0.2);
   }
 
   &:active:not(.selected) {
-    box-shadow: inset 0 1px 2px 0 darken($bright-blue, 15%), 0 0 2px 0 transparent;
-    background-color: darken($bright-blue, 5%);
+    box-shadow: inset 0 1px 2px 0 rgba(black, 0.3), 0 0 2px 0 transparent;
+    background-color: rgba(black, 0.3);
   }
 }

data/lib/ecrire/app/assets/stylesheets/admin/header.css.scss

@@ -4,11 +4,15 @@ main.posts > header {
   @include align-items(center);
   @include justify-content(center);
   @include flex-direction(column);
+
   background-color: $bright-blue;
   background-size: cover;
+  background-position: center left;
+
   color: lighten($bright-blue, 50%);
-  max-height: 200px;
+
   height: 30vh;
+  min-height: 200px;
 }
 
 main.edit.posts > header > div.title {

data/lib/ecrire/app/assets/stylesheets/admin/navigation.css.scss

@@ -1,3 +1,8 @@
+nav#Menu.admin section {
+  @include display(flex);
+  height: 100%;
+}
+
 nav#Menu.admin {
   @include display(flex);
   @include align-content(flex-start);
@@ -5,87 +10,93 @@ nav#Menu.admin {
   @include justify-content(space-between);
   @include flex-wrap(wrap);
 
-  height: 4em;
+  height: 3em;
   font-family: $fonts;
   font-size: 16px;
   font-weight: bold;
-  padding: 0 0.5em;
+  padding: 0 2em;
   z-index: 10;
 
-  background-color: darken($gray-blue, 25%);
-  color: lighten($gray-blue, 15%);
+  background-color: lighten($gray-blue, 25%);
+  color: darken($gray-blue, 30%);
   border-bottom: 1px solid darken($gray-blue, 75%);
-  box-shadow: inset 0 -1px 0 0 darken($gray-blue, 15%);
-  text-shadow: 0 -1px darken($light-blue, 75%);
 
   .button {
-    @include transition(text-shadow 0.2s ease-in, border-color 0.2s, background-color 0.2s, box-shadow 0.2s, color 0.2s);
-    border: 1px solid darken($navy-blue, 5%);
-    border-radius: 2px;
+    @include display(flex);
+    @include flex(0 0 auto);
+    @include align-items(center);
+    @include justify-content(center);
+
+    border-radius: 0;
+    border: none;
+    background: none;
+
+    height: 100%;
+
     text-decoration: none;
-    padding: 4px 8px;
-    margin: 0 0.5em;
+    padding: 4px 2em;
+    margin: 0;
     font-size: 0.8em;
     text-transform: uppercase;
-    font-weight: bolder;
-    background-color: lighten($navy-blue, 25%);
-    box-shadow: inset 0 1px 0 lighten($navy-blue, 35%), 0 1px 1px darken($navy-blue, 15%);
-    color: lighten($navy-blue, 60%);
-    text-shadow: 0 1px lighten($navy-blue, 25%);
+    font-weight: lighter;
+    color: inherit;
+    text-shadow: none;
 
     &.selected {
-      background-color: lighten($navy-blue, 25%);
-      border-color: lighten($navy-blue, 25%);
       color: lighten($navy-blue, 100%);
     }
 
     &:hover:not(.selected) {
-      border-color: darken($navy-blue, 25%);
+      text-decoration: underline;
+      box-shadow: none;
     }
 
     &:active:not(.selected) {
       color: lighten($navy-blue, 100%);
-      text-shadow: 0 1px lighten($navy-blue, 25%);
-      box-shadow: inset 0 0 2px darken($navy-blue, 15%), 0 1px 1px transparent;
-      border-color: darken($navy-blue, 15%);
-    }
-
-    &.home {
-      margin: 0 2em;
+      text-decoration: underline;
+      box-shadow: none;
     }
   }
 }
 
 nav#Menu.admin form.logout {
-  @include transition(color 0.3s,background-color 0.3s, border 0.3s, box-shadow 0.3s);
-  border: 1px solid lighten($red, 5%);
-  border-radius: 2px;
-  margin: 0;
-  padding: 4px 8px;
-  cursor: pointer;
-  outline: none;
-  background-color: lighten($red, 5%);
-  color: lighten($red, 30%);
-  box-shadow: inset 0 1px 0 0 lighten($red, 10%), 0 1px 1px darken($red, 20%);
-
-  &:hover {
-    border-color: darken($red, 10%);
-  }
+  @include display(flex);
+  @include flex(0 0 auto);
+  @include align-items(center);
+  @include justify-content(center);
 
-  &:active {
-    box-shadow: none;
-  }
+  margin: 0;
+  height: 100%;
 
   input {
-    padding: 0;
+    @include transition(box-shadow 0.1s ease, background-color 0.1s ease);
+
+    background-color: lighten($red, 15%);
+    color: darken($red, 25%);
+
+    cursor: pointer;
+    outline: none;
+
+    padding: 6px 10px;
     margin: 0;
-    background: none;
+
     border: none;
-    font-size:inherit;
-    color: inherit;
-    font-weight: 800;
+    border-radius: 2px;
+
+    font-size: 0.9em;
     font-family: inherit;
-    outline: none;
+    font-weight: bold;
+
+    box-shadow: 0 1px 1px 0 transparent;
+
+    &:hover {
+      box-shadow: 0 0.5px 0.5px 0 darken($red, 15%);
+    }
+
+    &:active {
+      box-shadow: 0 1px 1px 0 transparent;
+      background-color: darken($red, 5%);
+    }
   }
 
 }

data/lib/ecrire/app/assets/stylesheets/admin/posts.css.scss

@@ -51,7 +51,7 @@ main.posts > header > nav > div.publish.state {
   margin: 0 2em;
   width: 10em;
   height: 30px;
-  background-color: #dddddd;
+  background-color: rgba(black, 0.2);
   color: darken($bright-blue, 25%);
   border-radius: 60px;
   cursor: pointer;
@@ -93,7 +93,7 @@ main.posts > header > nav > div.publish.state {
   }
 
   &[published='true'] {
-    background-color: darken($bright-blue, 15%);
+    background-color: rgba(black, 0.5);
 
     label:first-child {
       background-color: darken($bright-blue, 25%);

data/lib/ecrire/app/assets/stylesheets/editor/code.css.scss

@@ -1,4 +1,23 @@
-article.content pre {
+article.content code, article.content pre {
+	border-radius: .3em;
+}
+
+article.content code {
   font-size: 0.7em;
-  background: $light-blue;
+}
+
+article.content pre {
+  background: lighten($light-blue, 5%);
+  border-top: 1px solid $light-blue;
+  padding: 0.7em;
+}
+
+article.content pre > code {
+  background: none;
+}
+
+article.content :not(pre) > code {
+  background: lighten($light-blue, 5%);
+  border-top: 1px solid $light-blue;
+  padding: 0.2em 0.5em;
 }

data/lib/ecrire/app/assets/stylesheets/vendor/prism.scss

@@ -37,19 +37,6 @@ code::selection, code ::selection {
 	}
 }
 
-/* Code blocks */
-pre {
-	padding: 1em;
-	margin: .5em 0;
-	overflow: auto;
-}
-
-/* Inline code */
-:not(pre) > code {
-	padding: .1em;
-	border-radius: .3em;
-}
-
 .token.comment,
 .token.prolog,
 .token.doctype,

data/lib/ecrire/app/models/admin/post.rb

@@ -42,7 +42,14 @@ module Admin
       html.xpath("//img").each do |img|
         img.remove
       end
-      self.compiled_excerpt = html.xpath('//body').children[0..20].to_s
+
+      valid_elements = %w(p ul ol li).freeze
+
+      elements = html.xpath('//body').children[0..4].take_while do |el|
+        valid_elements.include?(el.name)
+      end
+
+      self.compiled_excerpt = elements.map(&:to_s).join
     end
 
   end

data/lib/ecrire/app/models/post.rb

@@ -157,6 +157,7 @@ class Post < ActiveRecord::Base
 
   protected
 
+  #:nodoc:
   def update_tags
     ids = tags.map(&:id)
     unless ids == read_attribute(:tags)

data/lib/ecrire/app/views/admin/posts/titles/_title.html.erb

@@ -1,5 +1,7 @@
-<% post = Post.new(titles: [title], published_at: title.post.published_at) %>
 <li>
   <%= content_tag :p, title.name %>
-  <%= link_to url(Ecrire::Theme::Engine.post_path, post: post, absolute_path: true), url(Ecrire::Theme::Engine.post_path, post: post, absolute_path: true) %>
+  <% if title.post.published? %>
+    <% post = Post.new(titles: [title], published_at: title.post.published_at) %>
+    <%= link_to url(Ecrire::Theme::Engine.post_path, post: post, absolute_path: true), url(Ecrire::Theme::Engine.post_path, post: post, absolute_path: true) %>
+  <% end %>
 </li>

data/lib/ecrire/commands/server.rb

@@ -13,6 +13,7 @@ module Ecrire
 
         @server = Rails::Server.new
         @server.options[:Port] = options[:Port]
+        @server.options[:Host] = options[:Host]
       end
 
       def run!

data/lib/ecrire/markdown/node.rb

@@ -3,7 +3,7 @@ module Ecrire::Markdown
     autoload :Image,                   'ecrire/markdown/nodes/image'
     autoload :UnorderedList,           'ecrire/markdown/nodes/unordered_list'
     autoload :OrderedList,             'ecrire/markdown/nodes/ordered_list'
-    autoload :CodeBlock,               'ecrire/markdown/nodes/code_block'
+    autoload :Code,                    'ecrire/markdown/nodes/code'
     autoload :Heading,                 'ecrire/markdown/nodes/heading'
   end
 

data/lib/ecrire/markdown/nodes/code.rb

@@ -0,0 +1,63 @@
+require 'active_support/core_ext/string'
+
+module Ecrire::Markdown
+  module Nodes
+    class Code < Node
+
+      attr_reader :offset
+
+      attr_accessor :title, :block
+
+      def initialize(data)
+
+        @offset = data.offset(0)[0]
+        @language = (data[3] || "").strip
+
+        @content = data[4]
+
+      end
+
+      def block?
+        @block == true
+      end
+
+      def content=(new_content)
+        if new_content.is_a?(Array)
+          @content = ERB::Util.html_escape(new_content.join("\n"))
+        else
+          @content = new_content
+        end
+      end
+
+      def code_element
+        str = "<code"
+
+        unless @language.nil?
+          str << " class='language-#{@language}'>"
+        end
+
+        str << @content
+        str << "</code>"
+        str
+      end
+
+      def to_s
+
+        str = String.new
+
+        unless @title.nil?
+          str << "<header>#{@title}</header>"
+        end
+
+        str << code_element
+
+        if block?
+          return "<pre>#{str}</pre>"
+        else
+          return str
+        end
+      end
+    end
+  end
+end
+

data/lib/ecrire/markdown/parsers/code.rb

@@ -1,6 +1,9 @@
+require 'byebug'
+
 module Ecrire::Markdown::Parsers
   class Code < Base
-    OPENING_TAG = /^((~{3,})([a-z]+)?)( (.*))?$/i
+    OPENING_TAG = /((~{3,})([a-z]+)?)(.+)?/i
+    attr_accessor :open, :close
 
     def parse!
 
@@ -8,33 +11,51 @@ module Ecrire::Markdown::Parsers
         return @node
       end
 
-      if match = OPENING_TAG.match(@node.content)
-        count = match[2].size
-        language = match[3]
-        title = match[5]
-        nodes = extract_code_nodes!(count)
-        @node = Ecrire::Markdown::Nodes::CodeBlock.new(language, title, nodes)
-        @document.nodes[@index] = @node
+      while m = OPENING_TAG.match(@node.content)
+        node = Ecrire::Markdown::Nodes::Code.new(m) 
+        @node.content.slice!(m.offset(1)[0], m[1].size)
+        close(node, m[2].size)
       end
+
       return @node
     end
 
-    def extract_code_nodes!(count)
-      regex = Regexp.new("^(~{#{count}}$)")
-      found_closing_tag = false
+    def close(node, tildeCount)
+      regex = Regexp.new("(~{#{tildeCount},})", Regexp::IGNORECASE)
+
+      if match = regex.match(node.content)
+        @node.content.slice!(node.offset, match.offset(1)[1])
+        node.content.slice!(match.offset(0)[0], node.content.length - match.offset(0)[0])
+        node.content.lstrip!
+        @node.content.insert(node.offset, node.to_s)
+
+      elsif node.offset == 0
+        extract_siblings(node, regex)
+        @node = node
+      end
+    end
+
+    def extract_siblings(node, regex)
       i = @index + 1
       nodes = []
+      node.title = (node.content || "").strip
 
-      while !found_closing_tag
-        break if @document.nodes[i].nil?
-        node = @document.nodes.delete_at(i)
-        if regex.match(node.content)
-          found_closing_tag = true
+      while !(n = @document.nodes[i]).nil?
+        match = regex.match(n.content)
+        @document.nodes.delete_at(i)
+        if match.nil?
+          nodes.push n
         else
-          nodes.push node
+          break
         end
       end
-      nodes
+
+      node.content = nodes
+      node.block = true
+
+      @document.nodes[@index] = node
+
+      return node
     end
 
   end

data/lib/ecrire/onboarding/assets/stylesheets/browser.scss

@@ -0,0 +1,3 @@
+@import 'variables';
+@import 'shared/**/*';
+@import 'browser/**/*';

data/lib/ecrire/onboarding/assets/stylesheets/mobile.scss

@@ -0,0 +1,3 @@
+@import 'variables';
+@import 'shared/**/*';
+@import 'mobile/**/*';

data/lib/ecrire/onboarding/assets/stylesheets/{theme.css.scss → shared/base.scss}

@@ -67,6 +67,7 @@ body {
 }
 
 h1 {
+  text-align: center;
   font-size: 6em;
   font-family: courier;
   font-weight: normal;

data/lib/ecrire/onboarding/assets/stylesheets/{welcome.css.scss → shared/welcome.scss}

@@ -5,6 +5,7 @@
   }
 
   div.slogan {
+    text-align: center;
     font-size: 1.4em;
     letter-spacing: 2px;
 

data/lib/ecrire/onboarding/assets/stylesheets/tablet.scss

@@ -0,0 +1,4 @@
+@import 'variables';
+@import 'shared/**/*';
+@import 'tablet/**/*';
+

data/lib/ecrire/onboarding/views/layouts/application.html.erb

@@ -3,11 +3,13 @@
 
   <head>
     <%= title_tag 'Before you start blogging...' %>
-    <%= stylesheet_link_tag "ecrire", media: "all", "data-turbolinks-track" => true %>
-    <%= javascript_include_tag "ecrire", "base", "data-turbolinks-track" => true %>
 
-    <%= stylesheet_link_tag "theme", media: "all", "data-turbolinks-track" => true %>
-    <%= javascript_include_tag "theme", "base", "data-turbolinks-track" => true %>
+    <%= javascript_include_tag "ecrire", "application", "data-turbolinks-track" => true %>
+
+    <%= stylesheet_link_tag "browser", media: "(min-width: 1025px)", "data-turbolinks-track" => true %>
+    <%= stylesheet_link_tag "tablet", media: "(min-width: 641px) and (max-width: 1024px)", "data-turbolinks-track" => true %>
+    <%= stylesheet_link_tag "mobile", media: "(max-width: 640px)", "data-turbolinks-track" => true %>
+
     <%= csrf_meta_tags %>
     <%= favicon_tag %>
   </head>

data/lib/ecrire/theme/template/Gemfile

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

data/lib/ecrire/theme/template/assets/javascripts/application.js.coffee

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

data/lib/ecrire/version.rb

@@ -1,3 +1,3 @@
 module Ecrire
-  VERSION = '0.26.3'
+  VERSION = '0.27.0'
 end

data/test/editor/models/post_test.rb

@@ -89,4 +89,69 @@ class PostTest < ActiveSupport::TestCase
 
   end
 
+  test "excerpt is generated until it reaches 5 elements" do
+    post = Admin::Post.new({
+      content: "Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+Nunc malesuada diam id fringilla varius.
+Suspendisse ultricies sem ac enim pulvinar luctus.
+Pellentesque a nunc in libero convallis fringilla.
+Praesent nec ipsum ut turpis feugiat semper.
+Integer quis magna quis nisi porta hendrerit in a lorem.
+Nam dignissim sapien nec feugiat cursus.
+In tincidunt orci eget est scelerisque, a consequat massa consectetur.
+Donec et nunc at justo facilisis congue.
+Cras mollis orci ac arcu consectetur, quis bibendum leo gravida.
+Vivamus dapibus dolor eu tortor molestie, non pulvinar risus dignissim.
+Aliquam vitae lectus vehicula, euismod ex at, accumsan quam.
+Ut vulputate mauris hendrerit mauris placerat tempus quis eget diam.
+Sed vestibulum lacus eu vehicula finibus.
+Praesent non diam vitae eros congue pretium.
+Nulla tincidunt justo sit amet aliquet porta.
+Nam vel elit vitae diam mattis mattis.
+Phasellus in lacus eget sem tempus elementum.
+Integer gravida diam sit amet massa egestas convallis.
+Vestibulum dignissim odio sit amet sem condimentum, ut pharetra erat bibendum.
+Cras molestie tellus id convallis lobortis."
+    })
+
+    post.titles << Admin::Title.new(name: "Post Excerpt test.", post: post)
+
+    assert post.save, post.errors.full_messages.to_sentence
+
+    html = Nokogiri::HTML(post.compiled_excerpt)
+
+    assert html.css('body > *').length == 5
+
+  end
+
+  test "excerpt generation stops when it reaches an element that can't be part of it" do
+    post = Admin::Post.new({
+      content: "Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+[Nunc](http://google.com) malesuada diam id fringilla varius.
+Nam dignissim sapien nec feugiat cursus.
+- In tincidunt orci eget est scelerisque, a consequat massa consectetur.
+- Donec et nunc at justo facilisis congue.
+- Cras mollis orci ac arcu consectetur, quis bibendum leo gravida.
+Vivamus dapibus dolor eu tortor molestie, non pulvinar risus dignissim.
+Aliquam vitae lectus vehicula, euismod ex at, accumsan quam.
+# Ut vulputate mauris hendrerit mauris placerat tempus quis eget diam.
+Sed vestibulum lacus eu vehicula finibus.
+Praesent non diam vitae eros congue pretium.
+Nulla tincidunt justo sit amet aliquet porta.
+Nam vel elit vitae diam mattis mattis.
+Phasellus in lacus eget sem tempus elementum.
+Integer gravida diam sit amet massa egestas convallis.
+Vestibulum dignissim odio sit amet sem condimentum, ut pharetra erat bibendum.
+Cras molestie tellus id convallis lobortis."
+    })
+
+    post.titles << Admin::Title.new(name: "Post Excerpt test.", post: post)
+
+    assert post.save, post.errors.full_messages.to_sentence
+
+    html = Nokogiri::HTML(post.compiled_excerpt)
+
+    assert html.css('body > *').length == 5
+  end
+
 end

data/test/markdown/markdown_test.rb

@@ -35,6 +35,14 @@ class MarkdownTest < Minitest::Test
     assert_equal  "<p><strong>bold</strong> and <em>italic</em></p>", document.to_html
   end
 
+  def test_code_inline
+    document = Ecrire::Markdown.parse("This is a ~~~ruby inline code~~~ snippet")
+    assert_equal  "<p>This is a <code class='language-ruby'>inline code</code> snippet</p>", document.to_html
+
+    document = Ecrire::Markdown.parse("This is a ~~~ruby inline code~~~ snippet. Multiple ~~~ruby instance~~~ can coexist on the same line")
+    assert_equal  "<p>This is a <code class='language-ruby'>inline code</code> snippet. Multiple <code class='language-ruby'>instance</code> can coexist on the same line</p>", document.to_html
+  end
+
   def test_code_blocks
     document = Ecrire::Markdown.parse("~~~ruby\n# A comment\nRails.application\n~~~")
     assert_equal  "<pre><header></header><code class='language-ruby'># A comment\nRails.application</code></pre>", document.to_html
@@ -58,6 +66,11 @@ class MarkdownTest < Minitest::Test
     assert_equal '<ol><li>Ruby</li><li><strong>Go</strong></li></ol><ul><li>Test</li><li>123</li></ul>', document.to_html
   end
 
+  def test_lists_with_links
+    document = Ecrire::Markdown.parse("1. [Ruby](http://ruby.com)\n")
+    assert_equal "<ol><li><a href='http://ruby.com'>Ruby</a></li></ol>", document.to_html
+  end
+
   def test_image
     document = Ecrire::Markdown.parse('![An Image](http://bla.com)')
     assert_equal "<figure><img src='http://bla.com' /><figcaption>An Image</figcaption></figure>", document.to_html

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecrire
 version: !ruby/object:Gem::Version
-  version: 0.26.3
+  version: 0.27.0
 platform: ruby
 authors:
 - Pier-Olivier Thibault
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-06-28 00:00:00.000000000 Z
 dependencies: []
 description: Blog engine on Rails
 email: pothibo@gmail.com
@@ -181,7 +181,7 @@ files:
 - lib/ecrire/markdown.rb
 - lib/ecrire/markdown/document.rb
 - lib/ecrire/markdown/node.rb
-- lib/ecrire/markdown/nodes/code_block.rb
+- lib/ecrire/markdown/nodes/code.rb
 - lib/ecrire/markdown/nodes/heading.rb
 - lib/ecrire/markdown/nodes/image.rb
 - lib/ecrire/markdown/nodes/ordered_list.rb
@@ -199,17 +199,23 @@ files:
 - lib/ecrire/onboarding/assets/images/github-logo.png
 - lib/ecrire/onboarding/assets/images/profile.png
 - lib/ecrire/onboarding/assets/images/twitter-logo.png
+- lib/ecrire/onboarding/assets/javascripts/application.js
 - lib/ecrire/onboarding/assets/javascripts/databases/information.js.coffee
 - lib/ecrire/onboarding/assets/javascripts/message.js.coffee
-- lib/ecrire/onboarding/assets/javascripts/theme.js
-- lib/ecrire/onboarding/assets/stylesheets/complete.css.scss
-- lib/ecrire/onboarding/assets/stylesheets/fonts.css.scss
-- lib/ecrire/onboarding/assets/stylesheets/form.css.scss
-- lib/ecrire/onboarding/assets/stylesheets/message.css.scss
-- lib/ecrire/onboarding/assets/stylesheets/terminal.css.scss
-- lib/ecrire/onboarding/assets/stylesheets/theme.css.scss
+- lib/ecrire/onboarding/assets/stylesheets/browser.scss
+- lib/ecrire/onboarding/assets/stylesheets/browser/base.scss
+- lib/ecrire/onboarding/assets/stylesheets/mobile.scss
+- lib/ecrire/onboarding/assets/stylesheets/mobile/base.scss
+- lib/ecrire/onboarding/assets/stylesheets/shared/base.scss
+- lib/ecrire/onboarding/assets/stylesheets/shared/complete.scss
+- lib/ecrire/onboarding/assets/stylesheets/shared/fonts.scss
+- lib/ecrire/onboarding/assets/stylesheets/shared/form.scss
+- lib/ecrire/onboarding/assets/stylesheets/shared/message.scss
+- lib/ecrire/onboarding/assets/stylesheets/shared/terminal.scss
+- lib/ecrire/onboarding/assets/stylesheets/shared/welcome.scss
+- lib/ecrire/onboarding/assets/stylesheets/tablet.scss
+- lib/ecrire/onboarding/assets/stylesheets/tablet/base.scss
 - lib/ecrire/onboarding/assets/stylesheets/variables.css.scss
-- lib/ecrire/onboarding/assets/stylesheets/welcome.css.scss
 - lib/ecrire/onboarding/controllers/databases_controller.rb
 - lib/ecrire/onboarding/controllers/onboarding_controller.rb
 - lib/ecrire/onboarding/controllers/users_controller.rb
@@ -228,6 +234,7 @@ files:
 - lib/ecrire/theme/template/Procfile
 - lib/ecrire/theme/template/Rakefile
 - lib/ecrire/theme/template/assets/images/.keep
+- lib/ecrire/theme/template/assets/javascripts/application.js.coffee
 - lib/ecrire/theme/template/assets/stylesheets/browser.css.scss
 - lib/ecrire/theme/template/assets/stylesheets/browser/base.css.scss
 - lib/ecrire/theme/template/assets/stylesheets/mobile.css.scss

data/lib/ecrire/markdown/nodes/code_block.rb

@@ -1,30 +0,0 @@
-require 'active_support/core_ext/string'
-
-module Ecrire::Markdown
-  module Nodes
-    class CodeBlock < Node
-      def initialize(language, title, nodes)
-        @content = ERB::Util.html_escape(nodes.join("\n"))
-        @title = title
-        @language = language
-      end
-
-      def to_s
-        str = "<pre>"
-        str << "<header>#{@title}</header>"
-
-        str << "<code"
-
-        unless @language.nil?
-          str << " class='language-#{@language}'>"
-        end
-
-
-        str << @content
-        str << "</code></pre>"
-        str
-      end
-    end
-  end
-end
-