tawork 0.0.17 → 0.0.18

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTQ5ZTFkNzE4YmE1NTZkYjBmMzllNjY0ZDIyOTYyZjZkNTk3NzE4YQ==
+    MDFhYjA3MWViMzVlZmRkMjUwM2Q3N2Y4NWJkYTNiN2E5ZDQyYTJlZA==
   data.tar.gz: !binary |-
-    ZDhmZWQ5MTVhYzg0NjU3NTg2N2QzYzVmYTM3NGRiOWY1Y2QwYTM2NA==
+    MWZiYmY0NmIyZGZhNWU0ZjE5ZDY5MWViYTAxMmU5MzAyNDZhMmZhNQ==
 SHA512:
   metadata.gz: !binary |-
-    M2U1MWU0NzEwODE0YTA4YTQ3ZDIzMzU0ZmViNTNiZDNlOGRhZGZiOGVlNjkx
-    ZGIzMmRiZmY3OWUxZWMzMjU3MmNlMTY3NTZjMDUyZTBmMDlkYjJmZTYyZDcw
-    M2E4NzBiODIwMzE5ZGI1MjlkYTZjOThmMWMwMWFiNmNjZDYzNGY=
+    ODMzYjRmZTlmOWVjNDlmNjNmOWY5ZDQ2MmVjYzc5MWEwNDJjYzJhMTdlYjJh
+    MjJjYTUxMWY5MmZkM2NjZjQ2Mzg5MjBiYmYyZWJjMjI3MDkxMTZjNTcwYzdl
+    MmY5M2ZhOWI2M2E0YzUzY2I4MzRmYzFkYWVhMWFjODI5NDVlODc=
   data.tar.gz: !binary |-
-    MWZlNWZmZDljNDQ4YWUyY2I3N2ZjZWU1ZTA2ZTk5MjJkN2Q0OGNmZjNkMTQ1
-    NjlmZjMxZDFhMDVlZDE2ZjkzMjVhMTRiZjc2MWFhZDZmMzBkMWFjYmVkYWRh
-    ZTcxNWU0ZDk5ZDE3YTc1MDgwMTNjNzJkZTk0ZmNiODU0NGMwYzU=
+    YTc3YmZhOThmY2U0ODRjZjZjYTIxYWJmNDFmOTg5MTY1YjA3MjgzYzkzZDUz
+    ZDYxMmZmM2VjMDAzNmFlZGY2Yzg5MTA3ZjliYTA2ZjY2Y2UyNDNhMDk4Mjlj
+    OWU4YjRhZDUyNzkzMjFlMTBkOTViYTA4MmQ4ZGNlODJhMGI2NTQ=

data/Gemfile

@@ -18,6 +18,7 @@ gem 'omniauth-openid'
 gem 'simple_form'
 gem 'aasm'
 gem 'acts_as_list', git: "git@github.com:swanandp/acts_as_list.git"
+gem 'acts-as-taggable-on'
 gem 'public_activity'
 gem 'diffy'
 gem 'gollum-lib'

data/Gemfile.lock

@@ -52,6 +52,8 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
+    acts-as-taggable-on (3.0.2)
+      rails (>= 3, < 5)
     ancestry (2.0.0)
       activerecord (>= 3.0.0)
     ansi (1.4.3)
@@ -311,6 +313,7 @@ PLATFORMS
 DEPENDENCIES
   RedCloth
   aasm
+  acts-as-taggable-on
   acts_as_list!
   ancestry
   better_errors

data/app/assets/javascripts/application.js

@@ -19,6 +19,7 @@
 //= require bootstrap-typeahead
 //  require bootstrap-tree 
 //= require bootstrap-tagsinput
+//= require bootstrap-tokenfield
 //
 //= require moxie
 //= require plupload.dev

data/app/assets/javascripts/backbone/views/page.js.coffee

@@ -3,10 +3,24 @@ class Tawork.Views.PageView extends Backbone.View
     'click a.star': 'starred'
 
   initialize: (options = {}) ->
-    @page_id = @$el.data("page-id")
+    @page_id = page_id = @$el.data("page-id")
     @initialize_sortable_tree()
     @setup_uploader()
     @$("[data-toggle=tooltip]").tooltip()
+    @$("#tag_list").tokenfield().on 'tokenfield:createtoken', (e) ->
+      $.ajax
+        method: "POST"
+        url: "/wiki/pages/#{page_id}/add_tag"
+        data:
+          tag: e.token.value
+
+    @$("#tag_list").on 'tokenfield:removetoken', (e) ->
+      $.ajax
+        method: "POST"
+        url: "/wiki/pages/#{page_id}/remove_tag"
+        data:
+          tag: e.token.value
+
 
   initialize_sortable_tree: ->
     $self = @

data/app/assets/stylesheets/application.css

@@ -13,6 +13,7 @@
  *= require bootflat
  *= require bootflat-extensions
  *= require bootflat-square
+ *= require bootstrap-tokenfield
  *= require_tree .
  */
 

data/app/assets/stylesheets/bootstrap_and_overrides.sass

@@ -241,6 +241,7 @@ li.mjs-nestedSortable-expanded
     padding-bottom: .25em
 
 .last-updated
+  text-align: right
   .user, .time
     display: inline 
 
@@ -253,3 +254,11 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6
 .attachment
   .actions a
     margin-right: .5em
+
+div.tokenfield.form-control
+  border: none
+
+  &.focus
+    border: none
+    outline: none
+    box-shadow: none

data/app/controllers/wiki/pages_controller.rb

@@ -105,6 +105,18 @@ class Wiki::PagesController < ApplicationController
     render json: {}
   end
 
+  def add_tag
+    @page.tag_list.add(params[:tag])
+    @page.save
+    render json: {}
+  end
+
+  def remove_tag
+    @page.tag_list.remove(params[:tag])
+    @page.save
+    render json: {}
+  end
+
   protected
   def load_page
     @page = Page.find(params[:id]) if params[:id]

data/app/models/page.rb

@@ -6,6 +6,7 @@ class Page < ActiveRecord::Base
  
   has_ancestry #touch: true
   acts_as_list scope: [:ancestry]
+  acts_as_taggable
 
   attr_accessor :old_ancestor_ids
 
@@ -47,6 +48,8 @@ class Page < ActiveRecord::Base
   def last_updated
     activities.
       where(key: 'page.update_details').
+      order("created_at desc").first ||
+      activities.where(key: 'page.created').
       order("created_at desc").first
   end
 

data/app/views/wiki/pages/_display.html.haml

@@ -1,7 +1,11 @@
 .page-article{class: "page_#{@page.id}"}
   %h3.edit-helper.hide Title
   %h1#wiki-title.wiki-title= @page.title
-  = render 'last_updated'
+  .meta.row
+    .col-md-8
+      = render 'tags'
+    .col-md-4
+      = render 'last_updated'
 
   %h3.edit-helper.hide Body
   #wiki-content.wiki-content.content-description
@@ -21,11 +25,18 @@
         inline: true
         toolbar: "undo redo"
         menubar: false
+        setup: (ed) ->
+          ed.on 'init', (args) ->
+            window.initial_title = tinyMCE.get("wiki-title").getContent()
 
       tinymce.init
         selector: "div.wiki-content"
         convert_urls: false
         inline: true
+        setup: (ed) ->
+          ed.on 'init', (args) ->
+            window.initial_body = tinyMCE.get("wiki-content").getContent()
+
         plugins: [
           "autosave advlist autolink lists link image charmap"
           "searchreplace code fullscreen mention" 
@@ -118,14 +129,27 @@
                 $html = $("<a>", "data-mention": item.type, href: item.url).text(item.name)
 
             return $html.get(0).outerHTML
+
       false
 
     $(".edit").click ->
       enable_edit()
       $(".save").show()
+      $(".cancel").show()
       $(".edit").hide()
       false
 
+    $(".cancel").click ->
+      tinyMCE.execCommand('mceRemoveEditor', true, 'wiki-title')
+      tinyMCE.execCommand('mceRemoveEditor', true, 'wiki-content')
+      $(".edit-helper").toggleClass("hide")
+      $(".save").hide()
+      $(".cancel").hide()
+      $(".edit").show()
+      $("h1.wiki-title").html(window.initial_title)
+      $("div.wiki-content").html(window.initial_body)
+      false
+
     $(".save").click ->
       title = tinyMCE.get("wiki-title").getContent()
       body = tinyMCE.get("wiki-content").getContent()

data/app/views/wiki/pages/_last_updated.html.haml

@@ -1,4 +1,4 @@
-.last-updated.pull-right.meta
+.last-updated
   - if @last_updated
     %span Last updated by
     .user= @last_updated.owner.display_name

data/app/views/wiki/pages/_page_header.html.haml

@@ -2,16 +2,20 @@
   %li
     %a.edit{href: "#", data: {toggle: "tooltip", placement: "top"}, title: "Edit"} 
       %i.fa.fa-edit
+  %li
+    %a.cancel{href: "#", data: {toggle: "tooltip", placement: "top"}, title: "Cancel Edit", style: "display: none;"} 
+      %i.fa.fa-minus-circle
+
 
+  %li
+    %a.save{href: "#", data: {type: "PUT", url: wiki_page_path(@page), toggle: "tooltip", placement: "top"}, title: "Save", style: "display: none;"} 
+      %i.fa.fa-save
   %li
     %a.star{href: "#", data: {type: "POST", url: star_wiki_page_path(@page), toggle: "tooltip", placement: "top"}, title: "Star"}
       - if current_user.starred?(@page)
         %i.fa.fa-star
       - else
         %i.fa.fa-star-o
-  %li
-    %a.save{href: "#", data: {type: "PUT", url: wiki_page_path(@page), toggle: "tooltip", placement: "top"}, title: "Save", style: "display: none;"} 
-      %i.fa.fa-save
   %li
     = link_to history_wiki_page_path(@page), data: {toggle: "tooltip", placement: "top"}, title: "History" do
       %i.fa.fa-backward

data/app/views/wiki/pages/_tags.html.haml

@@ -0,0 +1,2 @@
+.page-tags
+  = text_field_tag :tag_list, @page.tag_list.join(","), placeholder: "add tags"

data/config/routes.rb

@@ -23,6 +23,8 @@ Rails.application.class.routes.draw do
         get :history
         post :reorder
         post :star
+        post :add_tag
+        post :remove_tag
 
         post :attach
       end

data/db/migrate/20140314014648_acts_as_taggable_on_migration.acts_as_taggable_on_engine.rb

@@ -0,0 +1,31 @@
+# This migration comes from acts_as_taggable_on_engine (originally 1)
+class ActsAsTaggableOnMigration < ActiveRecord::Migration
+  def self.up
+    create_table :tags do |t|
+      t.string :name
+    end
+
+    create_table :taggings do |t|
+      t.references :tag
+
+      # You should make sure that the column created is
+      # long enough to store the required class names.
+      t.references :taggable, :polymorphic => true
+      t.references :tagger, :polymorphic => true
+
+      # Limit is created to prevent MySQL error on index
+      # length for MyISAM table type: http://bit.ly/vgW2Ql
+      t.string :context, :limit => 128
+
+      t.datetime :created_at
+    end
+
+    add_index :taggings, :tag_id
+    add_index :taggings, [:taggable_id, :taggable_type, :context]
+  end
+
+  def self.down
+    drop_table :taggings
+    drop_table :tags
+  end
+end

data/db/migrate/20140314014649_add_missing_unique_indices.acts_as_taggable_on_engine.rb

@@ -0,0 +1,22 @@
+# This migration comes from acts_as_taggable_on_engine (originally 2)
+class AddMissingUniqueIndices < ActiveRecord::Migration
+
+  def self.up
+    add_index :tags, :name, unique: true
+
+    remove_index :taggings, :tag_id
+    remove_index :taggings, [:taggable_id, :taggable_type, :context]
+    add_index :taggings,
+      [:tag_id, :taggable_id, :taggable_type, :context, :tagger_id, :tagger_type],
+      unique: true, name: 'taggings_idx'
+   end
+
+  def self.down
+    remove_index :tags, :name
+
+    remove_index :taggings, name: 'tagging_idx'
+    add_index :taggings, :tag_id
+    add_index :taggings, [:taggable_id, :taggable_type, :context]
+  end
+
+end

data/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140313052226) do
+ActiveRecord::Schema.define(version: 20140314014649) do
 
   create_table "activities", force: true do |t|
     t.integer  "trackable_id"
@@ -70,7 +70,7 @@ ActiveRecord::Schema.define(version: 20140313052226) do
     t.string   "title"
     t.text     "body"
     t.integer  "creator_id"
-    t.integer  "position",   default: 1000
+    t.integer  "position"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -98,6 +98,24 @@ ActiveRecord::Schema.define(version: 20140313052226) do
 
   add_index "story_details", ["ticket_id"], name: "index_story_details_on_ticket_id", using: :btree
 
+  create_table "taggings", force: true do |t|
+    t.integer  "tag_id"
+    t.integer  "taggable_id"
+    t.string   "taggable_type"
+    t.integer  "tagger_id"
+    t.string   "tagger_type"
+    t.string   "context",       limit: 128
+    t.datetime "created_at"
+  end
+
+  add_index "taggings", ["tag_id", "taggable_id", "taggable_type", "context", "tagger_id", "tagger_type"], name: "taggings_idx", unique: true, using: :btree
+
+  create_table "tags", force: true do |t|
+    t.string "name"
+  end
+
+  add_index "tags", ["name"], name: "index_tags_on_name", unique: true, using: :btree
+
   create_table "tickets", force: true do |t|
     t.string   "state"
     t.string   "type"

data/lib/tawork/version.rb

@@ -1,3 +1,3 @@
 module Tawork
-  VERSION = '0.0.17'
+  VERSION = '0.0.18'
 end