tawork 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac26a56c3c8cd474334a1d3d3d731a636da0ce72
-  data.tar.gz: 6a2d3dd9c84b343a819b0ca9f5d0c18cff4005f4
+  metadata.gz: d7e69c8a32ba03f38b1cfe381b6819223aa1c489
+  data.tar.gz: 7a9e007c0137f1277c98910c46303bc6d88eab2f
 SHA512:
-  metadata.gz: af5aae6d26f7b45526cc571e95c6c001f5082086d602352545a11178585927cdf86c3353d44d1cf52417fd972cf546de9a46315893d149f5a5681b821d6a3fe3
-  data.tar.gz: 3b498268218302122996324a45e97b8fecf104086cb0f5351de11b34fe796fe90a6c78c8de9332ed294f982438c7438d947e9b981857922df119ef88cea996ef
+  metadata.gz: f871d2e3d9f1af34682c575fba7c4b2cd6776fc7b5dd213bac57661f8db09ad1a0810554401ac5bf87f8b753880d8ab1ab4574d1a3e739145163d2efc6b0ece6
+  data.tar.gz: e4e00c364918dc52dded5a534debacff44c5fa27a7d7ced52cc61d4350b87db27328fb341f3f2f0b47c9c93d8abbd1cbabdf6410a878753b86f04ddc36e02210

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

@@ -0,0 +1,59 @@
+class Tawork.Views.AttachmentView extends Backbone.View
+  events: 
+    'click .delete': 'delete_attachment'
+
+  initialize: (options = {}) ->
+    @attachment_id = @$el.data("attachment-id")
+    @setup_uploader()
+
+  delete_attachment: ->
+    self = this
+    if confirm("Are you sure you want to delete this file?")
+      $.ajax
+        method: "DELETE"
+        url: "/attachments/#{@attachment_id}"
+        success: (data) ->
+          self.remove()
+    false
+
+  setup_uploader: ->
+    uploader = new plupload.Uploader(
+      runtimes: "html5"
+      browse_button: "upload_attachment_#{@attachment_id}" # you can pass in id...
+      container: document.getElementById("attachments") # ... or DOM Element itself
+      url: "/attachments/#{@attachment_id}/upload"
+      filters:
+        max_file_size: "50mb"
+      multipart_params:
+        authenticity_token: $("meta[name=csrf-token]").attr('content')
+
+      init:
+        PostInit: ->
+          $("#filelist").html("")
+          # document.getElementById("uploadfiles").onclick = ->
+          #   uploader.start()
+          #   false
+
+        FilesAdded: (up, files) ->
+          plupload.each files, (file) ->
+            $template = $($("#upload_template").clone().html())
+            $template.attr("id", file.id).find(".filename").text(file.name + "(#{plupload.formatSize(file.size)})")
+            $("#filelist").append $template
+          uploader.start()
+
+
+        UploadProgress: (up, file) ->
+          $("##{file.id}").find(".bar").css(width: "#{file.percent}%")
+
+        FileUploaded: (up, file, response) ->
+          try
+            $("##{file.id}").fadeOut complete: ->
+              eval response.response
+          catch err
+            console.log err
+
+        Error: (up, err) ->
+          document.getElementById("console").innerHTML += "\nError #" + err.code + ": " + err.message
+    )
+
+    uploader.init()

data/app/assets/stylesheets/bootstrap_and_overrides.sass

@@ -229,3 +229,7 @@ li.mjs-nestedSortable-expanded
 
 h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6
   font-family: "Bitter", "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif
+
+.attachment
+  .actions a
+    margin-right: .5em

data/app/controllers/attachments_controller.rb

@@ -7,4 +7,16 @@ class AttachmentsController <  ApplicationController
       filename:     attachment.filename,
       disposition:  'inline'
   end
+
+  def upload
+    @attachment = Attachment.find params[:id]
+    @attachment.update(params[:file], current_user)
+  end
+
+  def destroy
+    @attachment = Attachment.find params[:id]
+    @attachment.destroy
+
+    render json: {}
+  end
 end

data/app/controllers/wiki/pages_controller.rb

@@ -24,9 +24,7 @@ class Wiki::PagesController < ApplicationController
   def show
     @space = @page.root
     @subtree = @page.subtree.group_by(&:parent_id)
-    @last_updated = @page.activities.
-      where(key: 'page.update_details').
-      order("created_at desc").first
+    @last_updated = @page.last_updated
   end
 
   def history
@@ -45,7 +43,12 @@ class Wiki::PagesController < ApplicationController
     if params[:markdown_body].present?
       update_params[:body] = redcarpet(params[:markdown_body])
     end
-    if @page.update_attributes(update_params)
+
+    if @page.last_updated.created_at != Time.parse(params[:timestamp])
+      @page.errors.add(:base, "This page was edited by someone. Please refresh.")
+    end
+
+    if @page.errors.none? && @page.update_attributes(update_params)
       @page.update_to_gollum(current_user)
       @last_updated = @page.create_activity key: "page.update_details", owner: current_user
     end
@@ -79,7 +82,7 @@ class Wiki::PagesController < ApplicationController
     @attachment = Attachment.create_from_uploaded_file(params[:file], current_user, attachable: @page)
 
     if @attachment.errors.none?
-      @activity = @ticket.page key: "ticket.attachment", 
+      @activity = @page.create_activity key: "page.attachment", 
         owner: current_user, recipient: @attachment
     end
   end

data/app/models/attachment.rb

@@ -24,9 +24,34 @@ class Attachment < ActiveRecord::Base
     attachment
   end
 
+  def update(file, user)
+    filename = file.original_filename
+    if update_attributes(
+      filename: filename,
+      content_type: file.content_type,
+      size: file.size)
+
+      save_to_gollum(
+        file, user, 
+        "uploading file: #{filename}"
+      )
+    end
+  end
+
+  def wiki_file
+    $wiki.file(wiki_page.path)
+  end
+
   def file_data
-    format = File.extname(filename).gsub(".", "")
-    $wiki.file(wiki_dir + "/" + wiki_attachment_data + "." + format).raw_data
+    wiki_file.raw_data
+  end
+
+  def wiki_page
+    $wiki.page(wiki_attachment_data, nil, wiki_dir)
+  end
+
+  def versions
+    wiki_page.versions
   end
 
   def save_to_gollum(file, user, message)
@@ -36,10 +61,12 @@ class Attachment < ActiveRecord::Base
       email:    user.email
     }
 
-    file_name = file.try(:original_filename) || File.basename(file.path)
-    extension = File.extname(file_name).gsub(".", "")
     data_file = file.try(:tempfile) || file
-    $wiki.write_page(wiki_attachment_data, extension, data_file, commit, wiki_dir)
+    if wiki_page.present?
+      $wiki.update_page(wiki_page, wiki_page.name, wiki_page.format, data_file, commit)
+    else
+      $wiki.write_page(wiki_attachment_data, :textile, data_file, commit, wiki_dir)
+    end
   end
 
   protected
@@ -49,6 +76,6 @@ class Attachment < ActiveRecord::Base
   end
 
   def wiki_dir
-    "attachments/#{id}"
+    "/attachments/#{id}"
   end
 end

data/app/models/page.rb

@@ -23,7 +23,7 @@ class Page < ActiveRecord::Base
   end
 
   def wiki_dir
-    "wiki/#{id}"
+    "/wiki/#{id}"
   end
 
   def update_to_gollum(user)
@@ -36,14 +36,20 @@ class Page < ActiveRecord::Base
     body_page = "#{id}-body"
     title_page = "#{id}-title"
 
-    $wiki.write_page(wiki_dir + "/" + body_page, :textile, body, commit) 
-    $wiki.write_page(wiki_dir + "/" + title_page, :textile, title, commit) 
+    $wiki.write_page("/" + body_page, :textile, body, commit, wiki_dir) 
+    $wiki.write_page("/" + title_page, :textile, title, commit, wiki_dir) 
   end
 
   def type
     @type || "Page"
   end
 
+  def last_updated
+    activities.
+      where(key: 'page.update_details').
+      order("created_at desc").first
+  end
+
   def versions
     $wiki.page("#{id}-body", nil, wiki_dir).try(:versions) || []
   end

data/app/views/attachments/upload.js.coffee

@@ -0,0 +1,2 @@
+$(".attachment[data-attachment-id=<%= @attachment.id %>]").replaceWith('<%=j render '/wiki/pages/attachment', attachment: @attachment %>')
+

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

@@ -1,5 +1,12 @@
-%tr.attachment
+%tr.attachment{data: {attachment_id: attachment.id}}
   %td.filename= link_to attachment.filename, attachment_path(attachment)
   %td.size= number_to_human_size(attachment.size)
-  %td.versions 1
+  %td.versions= attachment.versions.count
   %td.actions
+    %a.upload{href: "#", title: "Upload", id: "upload_attachment_#{attachment.id}"} 
+      %i.fa.fa-upload
+    %a.delete{href: "#", title: "Delete"}
+      %i.fa.fa-times
+    :coffeescript
+      $ ->
+        view = new Tawork.Views.AttachmentView el: $(".attachment[data-attachment-id=#{attachment.id}]").get(0)

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

@@ -129,17 +129,13 @@
         type: $(this).data("type")
         url: $(this).data("url")
         success: ->
-          $(".edit-helper").toggleClass("hide")
-          $(".save").hide()
-          $(".edit").show()
-          tinyMCE.remove('div');
 
         data:
+          timestamp: $(".time").data("timestamp")
           markdown_body: markdown_body
           type: #{@page.type.parameterize.to_json}
           parent_id: #{params[:parent_id].to_json}
           #{@page.type.parameterize}:
             title: title
             body: body
-
       false

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

@@ -3,4 +3,4 @@
     %span Last updated by
     .user= @last_updated.owner.display_name
     \-
-    .time= timeago_tag @last_updated.created_at, date_only: false
+    .time{data: {timestamp: @last_updated.created_at}}= timeago_tag @last_updated.created_at, date_only: false

data/app/views/wiki/pages/update.js.coffee

@@ -1,7 +1,11 @@
 <% if @page.errors.any? %>
-  alert <%=raw @ticket.errors.to_a.to_json %>
+  alert <%=raw @page.errors.full_messages.to_json %>
 <% else %>
   $(".page_<%= @page.id %> .last-updated")
     .replaceWith('<%=j render 'last_updated' %>')
   $(".page_<%= @page.id %> .last-updated time").timeago()
+  $(".edit-helper").toggleClass("hide")
+  $(".save").hide()
+  $(".edit").show()
+  tinyMCE.remove('div');
 <% end %>

data/config/routes.rb

@@ -27,7 +27,11 @@ Rails.application.class.routes.draw do
     end
   end
 
-  resources :attachments, only: [:show]
+  resources :attachments, only: [:show, :destroy] do
+    member do
+      post :upload
+    end
+  end
   resources :projects
 
   resources :tickets do

data/lib/tawork/version.rb

@@ -1,3 +1,3 @@
 module Tawork
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tawork
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Adnan Ali
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -49,6 +49,7 @@ files:
 - app/assets/javascripts/backbone/tawork.js.coffee
 - app/assets/javascripts/backbone/templates/.gitkeep
 - app/assets/javascripts/backbone/views/.gitkeep
+- app/assets/javascripts/backbone/views/attachment.js.coffee
 - app/assets/javascripts/backbone/views/page.js.coffee
 - app/assets/javascripts/backbone/views/ticket.js.coffee
 - app/assets/javascripts/backbone/views/tree_node_page.js.coffee
@@ -90,6 +91,7 @@ files:
 - app/models/ticket.rb
 - app/models/user.rb
 - app/models/user_verifier.rb
+- app/views/attachments/upload.js.coffee
 - app/views/comments/_comment.html.haml
 - app/views/comments/_form.html.haml
 - app/views/comments/create.js.coffee