ecrire 0.30.3 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 258dfb5d0362d97435137502ae3f3a5c3a21289e
-  data.tar.gz: 34cc4f333cf6bc2ec832675be825a370430e01f8
+  metadata.gz: 6a7e27d92b15dca6a3e8af8205fe5b5b077cb2a8
+  data.tar.gz: 0ae29bd5af4b8bc7c2ded6d07757acb6dc7d3501
 SHA512:
-  metadata.gz: 68e7c2876eb3029a02a3dff1ddda078a1ea748fdb9d1b02496cb18f0c6d56f4e9b837afccd14b6777673a952bd783c704d9b7c92a035d858c90b7a602f86e3ff
-  data.tar.gz: 6c8e2ff475b32c8f8d57e60c48194a04db7d797afb50d2faf5b6ea7aa0a8122f87fa349284ac0071245812213b45f0900957ef01441aa76f7aa247c9cec5c1b8
+  metadata.gz: 0717cf0826f164e19079fe379db5c1f7add7e4062245de7d31a334ac6b47767c7262e975ead466ac42eabd975e6278707c7115338b52f80d9ec3906f8839e9d0
+  data.tar.gz: 8193ad8ffa679b2294c6330c4ca29b239d1e513207aa11b1c490091d5d005d6ee7b4ffe7a3ff2543b414260856fd46e652d9c2413f100ba18d98f6ecc9d033ef

data/Gemfile

@@ -2,22 +2,26 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'rails',             '~> 4.2'
+gem 'rails'
 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 'written'
+gem 'warden'
+gem 'bcrypt'
+gem 'nokogiri'
+gem 's3'
+gem 'pg'
 gem 'pg_search'
-gem 'kaminari',          '~> 0.15'
+gem 'kaminari'
 
-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 'sprockets-rails'
+gem 'sass-rails'
+gem 'coffee-rails'
+gem 'turbolinks'
+gem 'bourbon'
+gem 'uglifier'
 gem 'jbuilder'
 
+gem 'rails_12factor', group: :production
+
 gem 'byebug'
+gem 'specterjs'

data/Rakefile

@@ -60,17 +60,10 @@ namespace :test do
     end
   end
 
-  Rake::TestTask.new 'markdown' do |t|
-    t.libs << "test"
-    t.test_files = FileList["test/markdown/**/*_test.rb"]
-    t.verbose = true
-  end
-
-
 end
 
 task :test do
-  %w(test:markdown test:editor test:onboarding test:theme).each do |name|
+  %w(test:editor test:onboarding test:theme).each do |name|
     Rake::Task[name].invoke
   end
 end

data/lib/ecrire.rb

@@ -1,7 +1,6 @@
 module Ecrire
 
   autoload :Application,        'ecrire/application'
-  autoload :Markdown,           'ecrire/markdown'
 
   ##
   # Returns true if Ecrire could find 
@@ -9,7 +8,7 @@ module Ecrire
   #
   def self.bundle?
     ENV['BUNDLE_GEMFILE'] ||= Dir.pwd + '/Gemfile'
-    File.exists?(ENV['BUNDLE_GEMFILE'])
+    File.exist?(ENV['BUNDLE_GEMFILE'])
   end
 
   if Ecrire.bundle?

data/lib/ecrire/app/assets/javascripts/admin.js

@@ -1,5 +1,6 @@
 //= require turbolinks
 //= require observejs
+//= require written
 //= require_tree ./admin
 //= require_tree ./vendor
 //= require_tree ./shared

data/lib/ecrire/app/assets/javascripts/admin/navigation/save.coffee

@@ -1,11 +1,10 @@
 ObserveJS.bind 'Editor.Save', class
   loaded: =>
     @on 'click', @save
-    @on 'keydown', window, @shouldSave
-    @on 'Editor:loaded', document, @cache
-    @on 'Editor:updated', document, @update
-    @on 'posts:update', document, @saved
-    @on 'beforeunload', window, @confirm
+    @when 'keydown', @shouldSave
+    @when 'Editor:loaded', @cache
+    @when 'posts:update', @saved
+    @when 'beforeunload', @confirm
 
   confirm: (e) =>
     if @cache() != PostBody.instance.toString()
@@ -31,7 +30,7 @@ ObserveJS.bind 'Editor.Save', class
     e.preventDefault()
     e.stopPropagation()
 
-    dialog = @retrieve('#SavePost')
+    dialog = @template('#SavePost')
 
     if e.type == 'click'
       dialog.dataset.preview = true
@@ -43,9 +42,10 @@ ObserveJS.bind 'Editor.Save', class
 
 ObserveJS.bind 'Editor.Save.Dialog', class
   loaded: =>
-    @on 'posts:update', document, @saved
+    @when 'posts:update', @saved
     xhr = new ObserveJS.XHR(@element())
-    xhr.data.set('post[content]', PostBody.instance.toString())
+    xhr.data.set('post[content][raw]', PostBody.instance.history.current.toString())
+    xhr.data.set('post[content][html]', PostBody.instance.history.current.toHTMLString())
     xhr.data.set('context', 'content')
     xhr.request.upload.addEventListener 'progress', @upload
     xhr.request.addEventListener 'progress', @download

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

@@ -0,0 +1,23 @@
+ObserveJS.bind 'Editor.Content', class
+  loaded: =>
+    code = Written.Parsers.Block.get('Code').prototype
+    code.highlight = (element) ->
+      Prism.highlightElement(element, false)
+
+    code = Written.Parsers.Inline.get('Code').prototype
+    code.highlight = (element) ->
+      Prism.highlightElement(element, false)
+
+    if @element().dataset.bucket?
+      uploader = new Written.Uploaders.AWS({
+        bucket: @element().dataset.bucket,
+        namespace: @element().dataset.namespace,
+        url: @element().dataset.url,
+        accessKey: @element().dataset.accessKey,
+        policy: @element().dataset.policy,
+        signature: @element().dataset.signature
+      })
+
+      Written.Parsers.Block.get('Image').uploader(uploader)
+    @written = new Written(this.element())
+    @written.initialize()

data/lib/ecrire/app/assets/javascripts/admin/posts/filters/tags.coffee

@@ -2,26 +2,22 @@ ObserveJS.bind 'Posts.Filter.Tags', class
   loaded: =>
     @on 'tags:index', @show
     @on 'click', @action
-    @element().appendChild(@retrieve('svg.placeholder'))
+    @when 'tags:filter:list:selected', @select
+    @element().appendChild(@template('svg.placeholder'))
 
   show: (e) =>
+    e.HTML.querySelector('ul')?.setAttribute('as', 'Tags.Filter.List')
     document.body.appendChild(e.HTML)
-    @on 'click', e.HTML, @select
 
   select: (e) =>
-    el = e.target
-    while el && !(el instanceof HTMLLIElement)
-      el = el.parentElement
-
-    return unless el?
-
+    el = e.detail
     input = @element().querySelector('input[type=hidden]')
-    span = @retrieve('span.tag')
+    span = @template('span.tag')
     span.textContent = el.dataset.name
     input.value = el.getAttribute('oid')
 
-    @retrieve('svg.placeholder').remove()
-    @element().appendChild(@retrieve('svg.clear'))
+    @element().querySelector('svg.placeholder')?.remove()
+    @element().appendChild(@template('svg.clear'))
     @element().appendChild(span)
     @element().classList.add 'tagged'
 
@@ -30,10 +26,11 @@ ObserveJS.bind 'Posts.Filter.Tags', class
     @changed(input)
 
   action: (e) =>
-    if @retrieve('svg.clear').contains(e.target)
-      @retrieve('svg.clear').remove()
-      @retrieve('span').remove()
-      @element().appendChild(@retrieve('svg.placeholder'))
+    clear = @element().querySelector('svg.clear')
+    if clear? && clear.contains(e.target)
+      clear.remove()
+      @element().querySelector('span')?.remove()
+      @element().appendChild(@template('svg.placeholder'))
       @element().classList.remove 'tagged'
       input = @element().querySelector('input[type=hidden]')
       input.value = null

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

@@ -7,12 +7,12 @@ ObserveJS.bind 'Post.Header', class
     @on 'dragleave', @cancel
     @on 'drop', @drop
 
-    @on 'ObserveJS:XHR:Failed', @failed
+    @when 'ObserveJS:XHR:Failed', @failed
 
     @on 'images:create', @refresh
     @on 'images:destroy', @refresh
 
-    @on 'scroll', window, @resize
+    @when 'scroll', @resize
 
     @maxHeight = parseFloat(window.getComputedStyle(this.element())['height'])
 
@@ -55,15 +55,15 @@ ObserveJS.bind 'Post.Header', class
   progress: (e) =>
     return unless e.lengthComputable
     percentComplete = e.loaded / e.total * 100.0;
-    progressBar = @retrieve('div.status.uploading').querySelector('.progressbar')
+    progressBar = @element().querySelector('div.status.uploading .progressbar')
     progressBar.firstElementChild.style.width = "#{percentComplete}%";
 
   failed: (e) =>
     errors = JSON.parse(e.response.target.responseText)
-    @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
+    @hide(@template('div.status.uploading'))
+    @show(@template('div.error.status'))
+    ul = @template('div.error.status').querySelector('ul')
+    @on 'click', @template('div.error.status').querySelector('button'), @clear
     for error in errors
       ul.insertAdjacentHTML('beforeend', "<li>#{error}</li>")
 
@@ -74,12 +74,13 @@ ObserveJS.bind 'Post.Header', class
     xhr = new ObserveJS.XHR(e.currentTarget)
     xhr.request.upload.onprogress = @progress
     xhr.send()
+    @show(@template('div.status.uploading'))
 
   over: (e) =>
     e.preventDefault()
     if !@element().classList.contains('image')
       @element().classList.add 'image'
-      @show(@retrieve('div.dropping.status'))
+      @show(@template('div.dropping.status'))
 
   cancel: (e) =>
     e.preventDefault()
@@ -102,19 +103,19 @@ ObserveJS.bind 'Post.Header', class
     if !@element().classList.contains('image')
       @element().classList.add 'image'
 
-    @show(@retrieve('div.status.uploading'))
-    @retrieve('div.status.uploading').querySelector('.progressbar > span').style.width = '0%';
+    @show(@template('div.status.uploading'))
+    @template('div.status.uploading').querySelector('.progressbar > span').style.width = '0%';
     xhr = new ObserveJS.XHR(@element())
     xhr.data.set 'image[file]', file
     xhr.request.upload.onprogress = @progress
     xhr.send()
 
   loading: =>
-    @element().firstElementChild.appendChild(@retrieve('div.status.uploading'))
+    @element().firstElementChild.appendChild(@template('div.status.uploading'))
 
   clear: (e) =>
     @element().classList.remove 'image'
-    for li in @retrieve('div.error.status').querySelectorAll('li')
+    for li in @template('div.error.status').querySelectorAll('li')
       li.remove()
 
     for status of @statuses

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

@@ -1,8 +1,8 @@
 ObserveJS.bind 'Posts.List', class
   loaded: =>
-    @on 'posts:index', document, @refresh
-    @on 'posts:drafts', document, @refresh
-    @on 'posts:published', document, @refresh
+    @when 'posts:index', @refresh
+    @when 'posts:drafts', @refresh
+    @when 'posts:published', @refresh
 
   refresh: (e) =>
     @element().innerHTML = e.HTML.innerHTML

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

@@ -1,7 +1,7 @@
 ObserveJS.bind 'Post.Tags', class
   loaded: =>
-    @on 'tags:toggle', document, @refresh
-    @on 'tags:create', document, @refresh
+    @when 'tags:toggle', @refresh
+    @when 'tags:create', @refresh
     @on 'tags:index', @show
 
   refresh: (e) =>

data/lib/ecrire/app/assets/javascripts/admin/posts/tags/list.coffee

@@ -1,7 +1,7 @@
 ObserveJS.bind 'Post.Tags.List', class
   loaded: =>
     @on 'mouseover', @clear
-    @on 'keydown', @element().parentElement, @navigate
+    @when 'keydown', @navigate
 
   navigate: (e) =>
     switch e.keyCode

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

@@ -1,8 +1,8 @@
 ObserveJS.bind 'Post.Title', class
   loaded: =>
     @on 'titles:index', @show
-    @on 'titles:update', document, @refresh
-    @on 'titles:create', document, @refresh
+    @when 'titles:update', @refresh
+    @when 'titles:create', @refresh
 
   show: (e) =>
     e.HTML.dataset.y = document.body.scrollTop

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

@@ -1,8 +1,8 @@
 ObserveJS.bind 'Post.Titles', class
   loaded: =>
     @on 'submit', @clear
-    @on 'titles:update', document, @refresh
-    @on 'titles:create', document, @refresh
+    @when 'titles:update', @refresh
+    @when 'titles:create', @refresh
 
     @element().querySelector('form input[type=text]').focus()
 

data/lib/ecrire/app/assets/javascripts/admin/tags/filter/list.coffee

@@ -0,0 +1,19 @@
+ObserveJS.bind 'Tags.Filter.List', class
+  loaded: =>
+    @on 'click', @select
+
+  select: (e) =>
+    el = e.target
+    while el && !(el instanceof HTMLLIElement)
+      el = el.parentElement
+
+    return unless el?
+
+    event = new CustomEvent('tags:filter:list:selected', {
+      bubbles: true
+      detail: el
+    })
+
+    @element().dispatchEvent(event)
+
+

data/lib/ecrire/app/assets/javascripts/shared/overlay.coffee

@@ -1,7 +1,7 @@
 ObserveJS.bind 'Overlay', class
   loaded: =>
     @on 'click', @clicked
-    @on 'keyup', document, @escaped
+    @when 'keyup', @escaped
     @on 'dialog:close', @remove
 
     @y = document.body.scrollTop

data/lib/ecrire/app/assets/javascripts/shared/popup.coffee

@@ -2,8 +2,8 @@ ObserveJS.bind 'Popup', class
   loaded: =>
     if btn = @element().querySelector('.close')
       @on 'click', btn, @remove
-    @on 'click', document, @clicked
-    @on 'keyup', document, @escaped
+    @when 'click', @clicked
+    @when 'keyup', @escaped
     @on 'dialog:close', @remove
 
   clicked: (e) =>

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

@@ -1,4 +1,4 @@
-#PostsIndexList > div.search {
+#PostsIndexList > form.search {
   @include display(flex);
   @include align-items(stretch);
 
@@ -8,7 +8,7 @@
   margin: 5%;
 }
 
-#PostsIndexList > div.search > input[type=text] {
+#PostsIndexList > form.search > input[type=text] {
   @include flex(1 100%);
   min-width: 200px;
   margin: 0 auto;

data/lib/ecrire/app/assets/stylesheets/admin/preview.scss

@@ -34,6 +34,25 @@
   }
 }
 
+#PostPreviewContent > article > figure {
+  border: 1px solid $gray-blue;
+
+  img {
+    max-width: 100%;
+    margin: 12px;
+  }
+
+  figcaption {
+    text-align: center;
+    font-style: italic;
+    font-size: 0.8em;
+    color: $light-blue;
+    background-color: $gray-blue;
+    padding: 0.2em 0.4em;
+  }
+}
+
+
 #PostPreviewContent pre {
   background-color: $light-blue;
   font-size: 0.7em;

data/lib/ecrire/app/assets/stylesheets/editor/content.scss

@@ -36,6 +36,7 @@ article.content {
     margin-left: 2em;
     li {
       margin: 0.2em 0;
+      padding: 0;
     }
   }
 

data/lib/ecrire/app/controllers/admin/posts_controller.rb

@@ -98,7 +98,7 @@ module Admin
     end
 
     def post_params
-      params.require(:post).permit(:content, :status, :stylesheet, :javascript, :slug)
+      params.require(:post).permit(:status, :stylesheet, :javascript, :slug, content: [:raw, :html])
     end
 
     def fetch_post