documentation-editor 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bbdfb27873ed22418a32d32e221d4a9897b1dd0
-  data.tar.gz: 8b288d1414343e4a2e94d30139a2eb429700f097
+  metadata.gz: b79d4a966c2746a06f7f13c50039e948196c10e5
+  data.tar.gz: 7a0c5c448291bde530f132e15fbc0922707ae850
 SHA512:
-  metadata.gz: 71d2057ec92150f85dd3a64fa0876e170af978482eaa1f575897e5baf187a3759c6833261fc6b98b4b3be67d16a03787338bcede430a85cdbe9f5a7328383679
-  data.tar.gz: 4bfd8ee057ca082d319e479ca55ef481520f93304553bfa8fdbb11761ffe13b83086e2dc7be58e18fdbcf7583ce4ead975ad2a55662bb49cc1fee9f1c7368d14
+  metadata.gz: 333b41db66a6c31912d1b1c2fdd243daccc34997053d7a0079bbbb20ec26fdb182524d51a16248491777ad7c68d9725eced7cff3df52d436bb48943258a40394
+  data.tar.gz: 7133b991b86e66e06ee55894424e1343ce6a1cc14948a1ea749c1efff5be69bcaf09f6bac0bb2d72a5b27e279d56389f1903a8ffb01add5158cb6457db35c2ef

data/app/assets/javascripts/documentation_editor/pages.js

@@ -13,6 +13,7 @@ angular.module('documentationEditorApp', ['ngFileUpload'])
     $scope.undoRedo = [];
     $scope.id = 0;
     $scope.slug = '';
+    $scope.thumbnailUrl = null;
     $scope.source = '';
 
     $scope.nextID = 0;
@@ -67,10 +68,11 @@ angular.module('documentationEditorApp', ['ngFileUpload'])
       return data.join("\n");
     }
 
-    $scope.init = function(id, slug, path) {
+    $scope.init = function(id, slug, thumbnailUrl, path) {
       $scope.id = id;
       $scope.slug = slug;
       $scope.path = path;
+      $scope.thumbnailUrl = thumbnailUrl;
 
       $http.get($scope.path + '/admin/' + id).then(function(content) {
         $scope.source = content.data.source;
@@ -471,6 +473,30 @@ angular.module('documentationEditorApp', ['ngFileUpload'])
       }
     };
 
+  }]).controller('ThumbnailUploaderController', ['$scope', 'Upload', function($scope, Upload) {
+    $scope.file = null;
+
+    $scope.$watch('file', function () {
+      $scope.upload($scope.id, $scope.file);
+    });
+
+    $scope.upload = function(id, file) {
+      if (file && file.length === 1) {
+        file = file[0];
+        Upload.upload({
+          url: $scope.$parent.path + '/admin/' + id + '/thumbnail',
+          file: file
+        }).success(function (data, status, headers, config) {
+          console.log('uploaded', data);
+          $scope.thumbnailUrl = data.url;
+          $('#upload-thumbnail').modal('hide');
+        }).error(function (data, status, headers, config) {
+          console.log('error', data);
+          alert('Error status: ' + status);
+        })
+      }
+    };
+
   }]).controller('HistoryController', ['$scope', '$http', '$sce', function($scope, $http, $sce) {
     $scope.pages = [];
 

data/app/assets/stylesheets/documentation_editor/pages.css.sass

@@ -98,6 +98,10 @@
           margin: 0
           &:focus
             outline: none
+    .pages
+      img
+        width: 100px
+
   .images
     height: 150px
     overflow: auto
@@ -109,7 +113,6 @@
       border: 1px solid #DDD
       margin-right: 5px
 
-
 .markdown-page
   h1, h2, h3, h4, h5, h6
     position: relative

data/app/controllers/documentation_editor/pages_controller.rb

@@ -19,7 +19,7 @@ module DocumentationEditor
       before_filter DocumentationEditor::Config.before_filter, only: [:preview, :show]
     end
 
-    before_filter :setup_page, only: [:edit, :source, :update, :commit, :preview, :destroy, :history, :versions]
+    before_filter :setup_page, only: [:edit, :source, :update, :commit, :preview, :destroy, :history, :versions, :upload_thumbnail]
 
     def index
     end
@@ -84,6 +84,13 @@ module DocumentationEditor
       render json: { id: image.id, url: image.image.url }
     end
 
+    def upload_thumbnail
+      thumb = @page.build_thumbnail
+      thumb.image = params[:file]
+      @page.save!
+      render json: { id: thumb.id, url: thumb.image.url }
+    end
+
     def history
     end
 

data/app/models/documentation_editor/page.rb

@@ -6,6 +6,8 @@ module DocumentationEditor
     has_many :revisions, class_name: 'Revision', dependent: :destroy
     belongs_to :published_revision, class_name: 'Revision', foreign_key: 'published_revision_id'
 
+    belongs_to :thumbnail, class_name: 'Image'
+
     def add_revision!(content, publish = false, author_id = nil)
       r = revisions.build
       r.author_id = author_id
@@ -18,5 +20,9 @@ module DocumentationEditor
       r
     end
 
+    def thumbnail_url
+      thumbnail.try(:image).try(:url)
+    end
+
   end
 end

data/app/views/documentation_editor/pages/edit.html.haml

@@ -1,5 +1,5 @@
 %div{"ng-app" => "documentationEditorApp"}
-  %section#documentation-editor{"ng-controller" => 'EditorController', "ng-init" => "init(#{@page.id}, #{@page.slug.to_json}, '#{admin_path.gsub(/\/admin$/, '')}')"}
+  %section#documentation-editor{"ng-controller" => 'EditorController', "ng-init" => "init(#{@page.id}, #{@page.slug.to_json}, #{@page.thumbnail_url.to_json}, '#{admin_path.gsub(/\/admin$/, '')}')"}
     .editor-header
       %ul.list-inline.pull-right
         %li
@@ -22,6 +22,10 @@
           %a.btn.btn-default.btn-sm{href: '#', 'ng-click' => 'toggleView($event)'}
             %i.fa.fa-arrows-h
             Switch View
+        %li
+          %a.btn.btn-default.btn-sm{href: '#', 'data-toggle' => 'modal', "data-target" => "#upload-thumbnail"}
+            %i.fa.fa-upload
+            Thumbnail
         %li
           %a.btn.btn-default.btn-sm{href: history_path(@page)}
             %i.fa.fa-history
@@ -32,7 +36,9 @@
             Undo
       %h1
         Edit
-        %small= page_path(@page.slug)
+        %small
+          = page_path('')
+          = @page.slug
 
     .editor-content{"ng-cloak" => true}
       %textarea.markdown{"ng-if" => "rawView", "ng-model" => "$parent.source"}
@@ -154,3 +160,18 @@
                   %input.form-control{type: 'text', 'ng-model' => 'caption', placeholder: 'Optional caption'}
               .text-center.form-group
                 .btn.btn-success{"ngf-select" => true, "ng-model" => 'files'} Select image
+
+    #upload-thumbnail.modal.fade{"ng-controller" => "ThumbnailUploaderController"}
+      .modal-dialog
+        .modal-content
+          .modal-header
+            %button.close{type: "button", "data-dismiss" => "modal", "aria-label" => "Close"}
+              %span{"aria-hidden" => true} ×
+            %h4 Configure the page thumbnail
+          .modal-body
+            .text-center.images
+              %img{src: '{{ thumbnailUrl }}'}
+            .form
+              .text-center.form-group
+                .btn.btn-success{"ngf-select" => true, "ng-model" => 'file', "ngf-multiple" => false} Select thumbnail
+

data/app/views/documentation_editor/pages/history.html.haml

@@ -10,7 +10,9 @@
           Back to Admin
     %h1
       History of
-      %small= page_path(@page.slug)
+      %small
+        = page_path('')
+        = @page.slug
   .editor-content
     .row{"ng-controller" => 'HistoryController', "ng-init" => "init(#{@page.id}, '#{admin_path.gsub(/\/admin$/, '')}')"}
       .col-sm-3

data/app/views/documentation_editor/pages/index.html.haml

@@ -4,9 +4,10 @@
 
   .editor-content
     %h3 Pages
-    %table.table.table-striped
+    %table.table.table-striped.pages
       %thead
         %tr
+          %th Thumbnail
           %th Title
           %th Slug
           %th Last modification
@@ -16,6 +17,9 @@
       %tbody
         - DocumentationEditor::Page.order('id DESC').each do |p|
           %tr
+            %td
+              - if p.thumbnail
+                = image_tag p.thumbnail_url
             %td= best_in_place p, :title, url: update_path(p)
             %td= best_in_place p, :slug, url: update_path(p)
             %td= l p.created_at, format: :short

data/config/routes.rb

@@ -9,6 +9,7 @@ DocumentationEditor::Engine.routes.draw do
     get '/:id/edit', as: :edit_page, :controller => 'pages', :action => 'edit'
     put '/:id', as: :update, :controller => 'pages', :action => 'update'
     post '/:id', :controller => 'pages', :action => 'commit'
+    post '/:id/thumbnail', as: :upload_thumbnail, :controller => 'pages', :action => 'upload_thumbnail'
     delete '/:id', as: :delete_page, :controller => 'pages', :action => 'destroy'
     get '/:id/preview', as: :preview_page, :controller => 'pages', :action => 'preview'
     get '/:prev/:cur/diff', :controller => 'pages', :action => 'diff'

data/db/migrate/20150903121913_add_thumbnail_id_to_pages.rb

@@ -0,0 +1,5 @@
+class AddThumbnailIdToPages < ActiveRecord::Migration
+  def change
+    add_column :documentation_editor_pages, :thumbnail_id, :integer
+  end
+end

data/lib/documentation_editor/parser.rb

@@ -21,6 +21,10 @@ class Kramdown::Parser::BlockKramdown < Kramdown::Parser::Kramdown
         code ||= content['codes'].detect { |code| code['language'].end_with?("|*") }
         @tree.children << Element.new(:html_element, 'pre')
         @tree.children.last.children << Element.new(:raw, code ? highlight(code['language'].split('|').first, code['code']) : "FIXME:#{@language}")
+      elsif content['codes'].size == 1
+        code = content['codes'].first
+        @tree.children << Element.new(:html_element, 'pre')
+        @tree.children.last.children << Element.new(:raw, highlight(code['language'].split('|').first, code['code']))
       else
         ul = Element.new(:html_element, 'ul', { class: 'nav nav-tabs' })
         tab_content = Element.new(:html_element, 'div', { class: 'tab-content' })

data/lib/documentation_editor/version.rb

@@ -1,3 +1,3 @@
 module DocumentationEditor
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: documentation-editor
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Algolia Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-21 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -158,6 +158,7 @@ files:
 - db/migrate/20150725063642_create_documentation_editor_images.rb
 - db/migrate/20150728040718_create_documentation_editor_revisions.rb
 - db/migrate/20150818102838_add_title_to_pages.rb
+- db/migrate/20150903121913_add_thumbnail_id_to_pages.rb
 - lib/documentation-editor.rb
 - lib/documentation_editor.rb
 - lib/documentation_editor/configuration.rb