ecrire 0.31.1 → 0.31.2

data/lib/ecrire/app/assets/stylesheets/admin/{preview.scss → posts/preview.scss}

@@ -1,10 +1,10 @@
-#PostPreviewContent > article {
+#PostPreview > article {
   @include justify-content(flex-start);
 
   max-width: 900px;
   margin: 0 auto;
   padding: 0 1em 6em 1em;
-  width: 100%;
+  width: 100vw;
 
   font-size: 1.3em;
   line-height: 1.6em;
@@ -14,6 +14,7 @@
   }
 
   ul, ol {
+    margin: 1.5em 0;
     padding-left: 1em;
   }
 
@@ -27,6 +28,7 @@
 
   li {
     margin: 0.3em 0;
+    padding: 0;
   }
 
   p {
@@ -53,7 +55,7 @@
 }
 
 
-#PostPreviewContent pre {
+#PostPreview pre {
   background-color: $light-blue;
   font-size: 0.7em;
   border-radius: 2px;
@@ -72,3 +74,4 @@
     display: inline-block;
   }
 }
+

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

@@ -0,0 +1,4 @@
+blockquote {
+  background: $light-blue;
+  padding: 4px 24px;
+}

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

@@ -10,6 +10,7 @@ article.content pre {
   background: lighten($light-blue, 5%);
   border-top: 1px solid $light-blue;
   padding: 0.7em;
+  line-height: 1.1em;
 }
 
 article.content pre > code {

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

@@ -4,7 +4,7 @@ article.content {
   font-weight: 200;
   outline: none;
   font-size: 1.3em;
-  max-width: calc(800px + 4em);
+  max-width: calc(900px + 4em);
   width: 100%;
   margin: 0 auto;
   padding: 0 2em;

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

@@ -0,0 +1,20 @@
+article.content div {
+  padding: 0.2rem 0.8rem;
+  border-left: solid 3px $light-blue;
+  font-size: 0.8rem;
+  position: relative;
+}
+
+article.content div:before {
+  content: 'HTML';
+  position: absolute;
+  left: -1.3rem;
+  top: 0;
+  bottom: 0;
+  width: 1rem;
+  font-size: 1.2rem;
+  font-weight: bold;
+  break-word: break-all;
+  color: $light-blue;
+  overflow-y: hidden;
+}

data/lib/ecrire/app/assets/stylesheets/variables.scss

@@ -8,7 +8,10 @@ $red: rgb(169, 40, 40);
 $light-blue: rgb(202, 217, 231);
 $bright-blue: rgb(41, 131, 195);
 $navy-blue: #324D66;
+
 $gray-blue: #85919D;
+$gray: #CCC;
+$light-gray: #e4e4e4;
 
 $green: rgb(92, 184, 92);
 

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

@@ -20,19 +20,19 @@ module Admin
     end
 
     def drafts
-      posts = Admin::Post.drafted
+      posts = Admin::Post
 
       posts = posts.search search_posts_params
-      @posts = posts.order('posts.created_at DESC').includes(:titles)
+      @posts = posts.drafted.order('posts.created_at DESC').includes(:titles)
 
       render 'index'
     end
 
     def published
-      posts = Admin::Post.published
+      posts = Admin::Post
 
       posts = posts.search search_posts_params
-      @posts = posts.order('posts.published_at DESC').includes(:titles)
+      @posts = posts.published.order('posts.published_at DESC').includes(:titles)
       render 'index'
     end
 

data/lib/ecrire/app/helpers/admin/images_helper.rb

@@ -3,7 +3,7 @@ module Admin
 
     def image_form_signature(policy)
       @signature ||= begin
-        key = Rails.application.secrets.s3['secret_key']
+        key = Rails.application.secrets.s3[:secret_key]
         sha = OpenSSL::Digest.new('sha1')
         digest = OpenSSL::HMAC.digest sha, key, policy
         Base64.encode64(digest).gsub("\n", "")
@@ -13,14 +13,14 @@ module Admin
     def image_form_policy(post)
       @policy ||= begin
                     namespace = [post.id]
-                    if Rails.application.secrets.s3.has_key?('namespace')
-                      namespace.insert 0, Rails.application.secrets.s3['namespace']
+                    if Rails.application.secrets.s3.has_key?(:namespace)
+                      namespace.insert 0, Rails.application.secrets.s3[:namespace]
                     end
 
                     policy = {
                       "expiration" => (Time.now + 10.years).utc.to_s(:iso8601),
                       "conditions" => [
-                        {"bucket" => Rails.application.secrets.s3['bucket']},
+                        {"bucket" => Rails.application.secrets.s3[:bucket]},
                         ["starts-with", "$key", "#{namespace.join('/')}/"],
                         ["starts-with", "$Content-Type", ""],
                         {"acl" => "private"}

data/lib/ecrire/app/helpers/admin/posts_helper.rb

@@ -19,12 +19,12 @@ module Admin
         contenteditable: true,
         href: admin_post_path(@post.id) do |div|
 
-          namespace = Pathname.new(Rails.application.secrets.s3['namespace'] || '')
+          namespace = Pathname.new(Rails.application.secrets.fetch(:s3, {})['namespace'] || '')
 
           if Rails.application.secrets.has_key?(:s3)
-            div['data-bucket'] = Rails.application.secrets.s3['bucket']
-            div['data-url'] = Rails.application.secrets.s3['url']
-            div['data-access-key'] = Rails.application.secrets.s3['access_key']
+            div['data-bucket'] = Rails.application.secrets.s3[:bucket]
+            div['data-url'] = Rails.application.secrets.s3[:url]
+            div['data-access-key'] = Rails.application.secrets.s3[:access_key]
             div['data-signature'] = image_form_signature(image_form_policy(@post))
             div['data-policy'] = image_form_policy(@post)
             div['data-namespace'] = namespace + @post.id.to_s

data/lib/ecrire/app/helpers/application_helper.rb

@@ -43,7 +43,7 @@ module ApplicationHelper
   # Will generate the asset url given with the +name+ of your favicon.
   #
   def favicon_tag(name = 'favicon.ico')
-    content_tag :link, nil, rel: %w(shortcut icon), href: asset_url(name)
+    content_tag :link, nil, rel: %w(shortcut icon), href: image_path(name)
   end
 
   ##

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

@@ -56,11 +56,11 @@ module Admin
 
       def initialize(options={})
         @errors = ActiveModel::Errors.new(self)
-        @access_key = options.fetch('access_key', "")
-        @secret_key = options.fetch('secret_key', "")
-        @path = options.fetch('path', "")
+        @access_key = options.fetch(:access_key, "")
+        @secret_key = options.fetch(:secret_key, "")
+        @path = options.fetch(:path, "")
 
-        @bucket = service.bucket(options.fetch('bucket', 'ecrire'))
+        @bucket = service.bucket(options.fetch(:bucket, 'ecrire'))
       end
 
       def configuration_hash

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

@@ -131,7 +131,7 @@ class Post < ActiveRecord::Base
   def content
     @content ||= begin
       content = read_attribute('content')
-      Content.new(content.fetch('raw', ''), content.fetch('html', ''))
+      Content.new(content.fetch('raw', ''), content.fetch('html', '').html_safe)
     end
   end
 

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

@@ -13,6 +13,10 @@ class User < ActiveRecord::Base
 
   validates_confirmation_of :password, if: ->{ password.present? }
 
+  def display_name
+    self.email
+  end
+
   def password
     return if self.encrypted_password.blank?
     @password ||= Password.new(self.encrypted_password)

data/lib/ecrire/app/views/admin/posts/_search.html.erb

@@ -19,14 +19,7 @@
   <% input[:name] = 'posts[title]' %>
   <% input[:class] << 'search' %>
   <% input[:form] = 'PostsFilter' %>
-
-  <% if search_posts_params[:status] == 'draft' %>
-    <% input[:placeholder] = 'Search for a draft' %>
-  <% elsif search_posts_params[:status] == 'published' %>
-    <% input[:placeholder] = 'Search for a published post' %>
-  <% else %>
-    <% input[:placeholder] = 'Search for any post' %>
-  <% end %>
+  <% input[:placeholder] = 'Search' %>
 
 <% end %>
 

data/lib/ecrire/app/views/admin/posts/help.js.erb

@@ -1 +1 @@
-e.HTML = "<%= j render('documentation') %>".toHTML()
+e.HTML = ObserveJS.HTML.parse("<%= j render('documentation') %>")

data/lib/ecrire/app/views/admin/posts/index.html.erb

@@ -1,25 +1,48 @@
-<% content_for 'Navigation::Posts' do %>
-
-  <%= content_tag :a, href: drafts_admin_posts_path do |a| %>
-    <% if action_name.eql?('drafts') %>
-      <% a.css << 'selected' %>
-    <% end %>
-    Drafts
-  <% end %>
-
-  <%= content_tag :a, href: published_admin_posts_path do |a| %>
-    <% if action_name.eql?('published') %>
-      <% a.css << 'selected' %>
-    <% end %>
-    Published
-  <% end %>
-
-  <%= link_to 'New Post', new_admin_post_path %>
-<% end %>
-
-<%= render('admin/navigation') %>
+<% content_for 'Content::Style', 'split' %>
+<% content_for 'Content::Class', 'list' %>
+
+<aside>
+  <%= link_to 'New Post', new_admin_post_path, class: %w(button new) %>
+
+  <ol>
+    <li>
+      <%= content_tag :a, href: admin_posts_path do |a| %>
+        <% if action_name.eql?('index') %>
+          <% a.css << 'selected' %>
+        <% end %>
+        All
+      <% end %>
+    </li>
+
+    <li>
+      <%= content_tag :a, href: drafts_admin_posts_path do |a| %>
+        <% if action_name.eql?('drafts') %>
+          <% a.css << 'selected' %>
+        <% end %>
+        Drafts
+      <% end %>
+    </li>
+
+    <li>
+      <%= content_tag :a, href: published_admin_posts_path do |a| %>
+        <% if action_name.eql?('published') %>
+          <% a.css << 'selected' %>
+        <% end %>
+        Published
+      <% end %>
+    </li>
+  </ol>
+
+</aside>
 
 <section id='PostsIndexList' class='posts'>
+  <% if action_name.eql?('drafts') %>
+    <h2>Draft Posts</h2>
+  <% elsif action_name.eql?('published') %>
+    <h2>Published Posts</h2>
+  <% else %>
+    <h2>All Posts</h2>
+  <% end %>
 
   <%= form_for :posts, url: {controller: 'admin/posts', action: action_name}, method: 'GET', html: {class: %w(search), name: 'posts', id: 'PostsFilter', as: 'Posts.Filter'} do |f| %>
     <%= render('search') %>

data/lib/ecrire/app/views/admin/posts/index.js.erb

@@ -1 +1 @@
-e.HTML = "<%= j content_tag(:ul, render(@posts)) %>".toHTML()
+e.HTML = ObserveJS.HTML.parse("<%= j content_tag(:ul, render(@posts)) %>")

data/lib/ecrire/app/views/admin/posts/show.html.erb

@@ -8,6 +8,6 @@
   <%= render 'admin/posts/header/base', post: @post %>
 <% end %>
 
-<section class='preview' id='PostPreviewContent'>
-  <%= content_tag :article, @post.compiled_content.try(:html_safe) %>
+<section id='PostPreview'>
+  <%= content_tag :article, @post.content.html %>
 <section>

data/lib/ecrire/app/views/admin/posts/tags/create.js.erb

@@ -1,2 +1,2 @@
-e.HTML = "<%= j render('admin/posts/tags/tag', tag: @tag, post: @post) %>".toHTML()
-e.TagsHTML = "<%= j post_tags(@post) %>".toHTML()
+e.HTML = ObserveJS.HTML.parse("<%= j render('admin/posts/tags/tag', tag: @tag, post: @post) %>")
+e.TagsHTML = ObserveJS.HTML.parse("<%= j post_tags(@post) %>")

data/lib/ecrire/app/views/admin/posts/tags/index.js.erb

@@ -1 +1 @@
-e.HTML = "<%= j popup_tag(render('admin/posts/tags/tags', post: @post, tags: @tags), class: %w(tags)) %>".toHTML()
+e.HTML = ObserveJS.HTML.parse("<%= j popup_tag(render('admin/posts/tags/tags', post: @post, tags: @tags), class: %w(tags)) %>")

data/lib/ecrire/app/views/admin/posts/tags/toggle.js.erb

@@ -1,2 +1,2 @@
-e.HTML = "<%= j render('admin/posts/tags/tag', tag: @tag, post: @post) %>".toHTML()
-e.TagsHTML = "<%= j post_tags(@post) %>".toHTML()
+e.HTML = ObserveJS.HTML.parse("<%= j render('admin/posts/tags/tag', tag: @tag, post: @post) %>")
+e.TagsHTML = ObserveJS.HTML.parse("<%= j post_tags(@post) %>")

data/lib/ecrire/app/views/admin/posts/titles/create.js.erb

@@ -1,6 +1,6 @@
 <% if @title.errors.any? %>
-  e.ErrorHTML = "<%= j content_tag(:div, @title.errors.to_a.to_sentence, class: %w(errors)) %>".toHTML()
+  e.ErrorHTML = ObserveJS.HTML.parse("<%= j content_tag(:div, @title.errors.to_a.to_sentence, class: %w(errors)) %>")
 <% else %>
-  e.HTML = "<%= j render('admin/posts/titles/title', title: @title) %>".toHTML()
+  e.HTML = ObserveJS.HTML.parse("<%= j render('admin/posts/titles/title', title: @title) %>")
 <% end %>
 

data/lib/ecrire/app/views/admin/posts/titles/index.js.erb

@@ -1,2 +1,2 @@
-e.HTML = "<%= j popup_tag(render('admin/posts/titles/form', post: @post, title: @title), class: %w(popup titles)) %>".toHTML()
+e.HTML = ObserveJS.HTML.parse("<%= j popup_tag(render('admin/posts/titles/form', post: @post, title: @title), class: %w(popup titles)) %>")
 

data/lib/ecrire/app/views/admin/posts/titles/update.js.erb

@@ -1 +1 @@
-e.HTML = "<%= j render('admin/posts/titles/title', title: @title) %>".toHTML()
+e.HTML = ObserveJS.HTML.parse("<%= j render('admin/posts/titles/title', title: @title) %>")

data/lib/ecrire/app/views/admin/profiles/show.js.erb

@@ -1 +1 @@
-e.HTML = "<%= j render("menu") %>".toHTML()
+e.HTML = ObserveJS.HTML.parse("<%= j render("menu") %>")

data/lib/ecrire/app/views/admin/tags/create.js.erb

@@ -1 +1 @@
-e.HTML = "<%= j render('admin/posts/tags/dialog/tag', tag: @tag, post: @post) %>".toHTML()
+e.HTML = ObserveJS.HTML.parse("<%= j render('admin/posts/tags/dialog/tag', tag: @tag, post: @post) %>")

data/lib/ecrire/app/views/admin/tags/index.js.erb

@@ -1 +1 @@
-e.HTML = "<%= j popup_tag(render('admin/tags/tags', tags: @tags), id: 'TagsPopup') %>".toHTML()
+e.HTML = ObserveJS.HTML.parse("<%= j popup_tag(render('admin/tags/tags', tags: @tags), id: 'TagsPopup') %>")

data/lib/ecrire/app/views/admin/tags/update.js.erb

@@ -1,2 +1,2 @@
 e.ObjectID = <%= @tag.id %>
-e.HTML = "<%= j render('admin/posts/tags/tag', post: @post, tag: @tag)%>".toHTML()
+e.HTML = ObserveJS.HTML.parse("<%= j render('admin/posts/tags/tag', post: @post, tag: @tag)%>")

data/lib/ecrire/app/views/admin/titles/edit.js.erb

@@ -1 +1 @@
-e.HTML = "<%= j render('title', post: post) %>".toHTML()
+e.HTML = ObserveJS.HTML.parse("<%= j render('title', post: post) %>")

data/lib/ecrire/app/views/admin/titles/errors.js.erb

@@ -1,5 +1,5 @@
 e.Errors = [
   <% @title.errors.each do |key, message| %>
-    "<%= j content_tag(:li, message) %>".toHTML(),
+    ObserveJS.HTML.parse("<%= j content_tag(:li, message) %>"),
   <% end %>
 ]

data/lib/ecrire/app/views/admin/titles/index.js.erb

@@ -1 +1 @@
-e.HTML = "<%= j render('titles', post: post) %>".toHTML()
+e.HTML = ObserveJS.HTML.parse("<%= j render('titles', post: post) %>")

data/lib/ecrire/app/views/layouts/admin/application.html.erb

@@ -4,11 +4,29 @@
     <title>Ecrire</title>
     <link rel="shortcut icon" href="<%= image_url("favicon.ico")%>" />
     <%= stylesheet_link_tag    "admin", media: "all" %>
-    <%= javascript_include_tag "admin" %>
+    <%= javascript_include_tag "admin", 'data-turbolinks-track' => "reload" %>
     <%= csrf_meta_tags %>
   </head>
   <%= content_tag :body, class: [action_name, controller_name] do %>
-    <%= main_tag do %>
+    <nav id='AdminNavigation'>
+      <%= link_to '/', class: %w(home) do %>
+        <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Arrow_circled_left" x="0px" y="0px" viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">
+          <path d="M10,0.4c-5.303,0-9.601,4.298-9.601,9.6c0,5.303,4.298,9.601,9.601,9.601c5.301,0,9.6-4.298,9.6-9.601  C19.6,4.698,15.301,0.4,10,0.4z M9.999,17.6c-4.197,0-7.6-3.402-7.6-7.6s3.402-7.6,7.6-7.6S17.6,5.803,17.6,10  S14.196,17.6,9.999,17.6z M10,5.5L5.5,10l4.5,4.5V12h4V8h-4V5.5z"/>
+        </svg>
+        Back to your blog
+      <% end %>
+
+      <div>
+        <%= link_to 'Posts', admin_posts_path %>
+        <%= link_to 'Tags', admin_tags_path %>
+        <a>Settings</a>
+      </div>
+
+      <a class='profile'>
+        <%= current_user.display_name %>
+      </a>
+    </nav>
+    <%= main_tag class: [content_for('Content::Class')], 'data-style' => content_for('Content::Style') || 'plain' do %>
       <%= yield %>
     <% end %>
   <% end %>

data/lib/ecrire/application.rb

@@ -5,6 +5,7 @@ require 'kaminari'
 require 'observejs'
 require 'written'
 require 'pg_search'
+require 'autoprefixer-rails'
 
 module Ecrire
   ##
@@ -23,15 +24,7 @@ module Ecrire
   #
   #
   class Application < Rails::Application
-    require 'ecrire/config/environment'
-
-    config.before_initialize do
-      if paths['config/database'].existent.any?
-        require 'ecrire/theme/engine'
-      else
-        require 'ecrire/onboarding/engine'
-      end
-    end
+    attr_writer :pwd
 
     ##
     # There seems to be a crack between when the configuration
@@ -58,35 +51,66 @@ module Ecrire
     end
 
     ##
-    # Return paths based off Rails default plus some customization.
+    # Override Rails secrets management as
+    # it doesn't allow us to do what we want.
+    # Then, Ecrire will merge anything that is
+    # through environment variables
     #
-    # These paths are Ecrire's, not the users's theme.
-    #
-    # For the user's paths, look at Ecrire::Theme::Engine.paths
-    #
-    def paths
-      @paths ||= begin
-         paths = super
-         paths.add 'config/secrets', with: Dir.pwd + '/secrets.yml'
-         paths.add 'config/database', with: Dir.pwd + '/secrets.yml'
-         paths.add 'config/routes.rb', with: 'routes.rb'
-         paths.add 'config/locales', with: 'locales', glob: "**/*.{rb,yml}"
-         paths
-       end
+    def secrets
+      @secrets ||= begin
+        secrets = ActiveSupport::OrderedOptions.new
+        yaml    = config.paths["config/secrets"].first
+
+        if File.exist?(yaml)
+          require "erb"
+          content = YAML.load(ERB.new(IO.read(yaml)).result) || {}
+          secrets.merge!(content.deep_symbolize_keys)
+        end
+
+        if ENV.has_key?(Ecrire::SECRET_ENVIRONMENT_KEY)
+          require 'json'
+          secrets.merge!(JSON.parse(ENV[Ecrire::SECRET_ENVIRONMENT_KEY]).deep_symbolize_keys)
+        end
+        
+        # Fallback to config.secret_key_base if secrets.secret_key_base isn't set
+        secrets.secret_key_base ||= config.secret_key_base
+        # Fallback to config.secret_token if secrets.secret_token isn't set
+        secrets.secret_token ||= config.secret_token
+
+        secrets
+      end
     end
 
-    ##
-    # Returns true if Ecrire::Onboarding::Engine is loaded
-    # in the application runtime
-    #
-    def self.onboarding?
-      defined?(Ecrire::Onboarding::Engine)
+    def config
+      @config ||= Ecrire::Configuration.new(Pathname.new(self.class.called_from))
+    end
+
+    class << self
+
+      ##
+      # Returns true if Ecrire::Onboarding::Engine is loaded
+      # in the application runtime
+      #
+      def onboarding?
+        secrets.fetch(:onboarding, true)
+      end
+
     end
 
     Rails::Application::Bootstrap.initializers.select do |initializer|
       initializer.name.eql? :bootstrap_hook
     end.first.instance_variable_set :@block, Proc.new {}
 
+    config.before_initialize do
+      require 'ecrire/config/environment'
+      if onboarding?
+        require 'ecrire/onboarding/engine'
+      else
+        require 'ecrire/theme/engine'
+      end
+    end
+
+
   end
 
 end