tawork 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d20bcb5f3caf86bf4454ac63953b9eae81ab8440
-  data.tar.gz: 145edd2aa7872a0e3af18c559531608ea2d26180
+  metadata.gz: d0cbf3fdbc08ae9f414d4ad260fed7fe045ff68d
+  data.tar.gz: 43483a17aca3491d79818dd10a3215b9a5de9e9d
 SHA512:
-  metadata.gz: 0d61ca1bafb6ec81663a7f51a1c5cc50e63de49d95d32a42121aa60500d276e13715f44e3a10682d5bf25f0fdebc156b35715aabf09182f9d9169f4ad8753f84
-  data.tar.gz: 144f59ea3d405793093e83f77adaf74920fa72aeb80df0a1f61cab8431c46914f32aefc17a70b4c1cbcb05905fbf4879f5d2e08e27a83f1d8d36907d0f778bc6
+  metadata.gz: 7c76f9afbe69ba90410b02d7b52b7200228b55e77131f00efed288348e964b0109918bf92ec08320a48fbe454fe292bdcb3f39bcbe8bdd4ab325c628b2b88ed5
+  data.tar.gz: 33c50c59b610d41296fb4cf3a35b8313707c90981dc5ba27c80d18d3a8d0698ee7b756d55bab95de4f422e3911787276b0f56c149261113bd7d3d386f2cdaf9c

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rails-assets.org'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 # gem 'rails', '4.1.0.beta1'
-# gem 'rails', github: 'rails/rails'
+gem 'rails', github: 'rails/rails'
 
 # Use mysql as the database for Active Record
 gem 'mysql2'
@@ -34,6 +34,7 @@ gem 'tinymce-rails', git: "git@github.com:spohlenz/tinymce-rails.git", branch: "
 gem 'plupload-rails'
 gem 'rails-timeago'
 gem "font-awesome-rails"
+gem 'blockuijs-rails',  :git => 'git://github.com/rusanu/blockuijs-rails.git'
 
 gem 'rails-assets-underscore'
 gem 'rails-assets-backbone'
@@ -74,9 +75,7 @@ group :development do
   gem 'rack-mini-profiler'
   gem 'foreman'
   gem "thin"
-  gem "awesome_print"
-  gem 'pry'
-  gem 'pry-remote'
+  gem 'jazz_hands'
 end
 
 

data/Gemfile.lock

@@ -1,3 +1,56 @@
+GIT
+  remote: git://github.com/rails/rails.git
+  revision: 6ef0569b0bf6e13d63f6c51790745b2007b92973
+  specs:
+    actionmailer (4.1.0.beta1)
+      actionpack (= 4.1.0.beta1)
+      actionview (= 4.1.0.beta1)
+      mail (~> 2.5.4)
+    actionpack (4.1.0.beta1)
+      actionview (= 4.1.0.beta1)
+      activesupport (= 4.1.0.beta1)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.1.0.beta1)
+      activesupport (= 4.1.0.beta1)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.0.beta1)
+      activesupport (= 4.1.0.beta1)
+      builder (~> 3.1)
+    activerecord (4.1.0.beta1)
+      activemodel (= 4.1.0.beta1)
+      activesupport (= 4.1.0.beta1)
+      arel (~> 5.0.0)
+    activesupport (4.1.0.beta1)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    rails (4.1.0.beta1)
+      actionmailer (= 4.1.0.beta1)
+      actionpack (= 4.1.0.beta1)
+      actionview (= 4.1.0.beta1)
+      activemodel (= 4.1.0.beta1)
+      activerecord (= 4.1.0.beta1)
+      activesupport (= 4.1.0.beta1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.1.0.beta1)
+      sprockets-rails (~> 2.0.0)
+    railties (4.1.0.beta1)
+      actionpack (= 4.1.0.beta1)
+      activesupport (= 4.1.0.beta1)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+
+GIT
+  remote: git://github.com/rusanu/blockuijs-rails.git
+  revision: 5deb1d36a861327dd54002d559fcd0e6197a3c83
+  specs:
+    blockuijs-rails (0.1.0)
+      rails (>= 3.1)
+
 GIT
   remote: git@github.com:spohlenz/tinymce-rails.git
   revision: b398df1b434d56e20d1c2ae65fa0715cb6bf16e5
@@ -19,36 +72,12 @@ GEM
   specs:
     RedCloth (4.2.9)
     aasm (3.0.23)
-    actionmailer (4.0.2)
-      actionpack (= 4.0.2)
-      mail (~> 2.5.4)
-    actionpack (4.0.2)
-      activesupport (= 4.0.2)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    activemodel (4.0.2)
-      activesupport (= 4.0.2)
-      builder (~> 3.1.0)
-    activerecord (4.0.2)
-      activemodel (= 4.0.2)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.2)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.2)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
     ancestry (2.0.0)
       activerecord (>= 3.0.0)
     ansi (1.4.3)
-    arel (4.0.1)
+    arel (5.0.0)
     atomic (1.1.14)
-    awesome_print (1.1.0)
+    awesome_print (1.2.0)
     bcrypt-ruby (3.1.2)
     better_errors (0.3.2)
       coderay (>= 1.0.0)
@@ -57,7 +86,7 @@ GEM
       debug_inspector (>= 0.0.1)
     bootstrap-sass (3.0.3.0)
       sass (~> 3.2)
-    builder (3.1.4)
+    builder (3.2.2)
     charlock_holmes (0.6.9.4)
     coderay (1.0.8)
     coffee-rails (4.0.1)
@@ -67,8 +96,16 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.6.3)
+    columnize (0.3.6)
+    coolline (0.4.3)
     daemons (1.1.9)
     debug_inspector (0.0.2)
+    debugger (1.6.5)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.3.1)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.3.1)
     devise (3.2.2)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
@@ -98,6 +135,10 @@ GEM
       pygments.rb (~> 0.5.2)
       sanitize (~> 2.0.6)
       stringex (~> 2.1.0)
+    grit (2.5.0)
+      diff-lcs (~> 1.1)
+      mime-types (~> 1.15)
+      posix-spawn (~> 0.3.6)
     haml (4.0.4)
       tilt
     haml-contrib (1.0.0.1)
@@ -110,7 +151,20 @@ GEM
     hashie (2.0.5)
     hashr (0.0.22)
     hike (1.2.3)
+    hirb (0.7.1)
     i18n (0.6.9)
+    jazz_hands (0.5.2)
+      awesome_print (~> 1.2)
+      coolline (>= 0.4.2)
+      hirb (~> 0.7.1)
+      pry (~> 0.9.12)
+      pry-debugger (~> 0.2.2)
+      pry-doc (~> 0.4.6)
+      pry-git (~> 0.2.3)
+      pry-rails (~> 0.3.2)
+      pry-remote (>= 0.1.7)
+      pry-stack_explorer (~> 0.4.9)
+      railties (>= 3.0, < 5.0)
     jbuilder (1.5.3)
       activesupport (>= 3.0.0)
       multi_json (>= 1.2.0)
@@ -128,7 +182,7 @@ GEM
     method_source (0.8.2)
     mime-types (1.25.1)
     mini_portile (0.5.2)
-    minitest (4.7.5)
+    minitest (5.2.2)
     multi_json (1.8.4)
     mysql2 (0.3.14)
     nokogiri (1.6.1)
@@ -148,9 +202,24 @@ GEM
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
+    pry-debugger (0.2.2)
+      debugger (~> 1.3)
+      pry (~> 0.9.10)
+    pry-doc (0.4.6)
+      pry (>= 0.9)
+      yard (>= 0.8)
+    pry-git (0.2.3)
+      diffy
+      grit
+      pry (>= 0.9.8)
+    pry-rails (0.3.2)
+      pry (>= 0.9.10)
     pry-remote (0.1.7)
       pry (~> 0.9)
       slop (~> 3.0)
+    pry-stack_explorer (0.4.9.1)
+      binding_of_caller (>= 0.7)
+      pry (>= 0.9.11)
     public_activity (1.4.0)
       actionpack (>= 3.0.0)
       activerecord (>= 3.0)
@@ -167,14 +236,6 @@ GEM
       ruby-openid (>= 2.1.8)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.2)
-      actionmailer (= 4.0.2)
-      actionpack (= 4.0.2)
-      activerecord (= 4.0.2)
-      activesupport (= 4.0.2)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.2)
-      sprockets-rails (~> 2.0.0)
     rails-assets-backbone (1.1.0)
     rails-assets-highlightjs (7.5.0)
     rails-assets-jquery (2.0.3)
@@ -186,11 +247,6 @@ GEM
     rails-timeago (2.8.0)
       actionpack (>= 3.1)
       activesupport (>= 3.1)
-    railties (4.0.2)
-      actionpack (= 4.0.2)
-      activesupport (= 4.0.2)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
     rake (10.1.1)
     rdoc (3.12.2)
       json (~> 1.4)
@@ -243,13 +299,15 @@ GEM
       polyglot (>= 0.3.1)
     turbolinks (2.0.0)
       coffee-rails
-    tzinfo (0.3.38)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
     uglifier (2.3.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     warden (1.2.3)
       rack (>= 1.0)
     yajl-ruby (1.1.0)
+    yard (0.8.7.3)
 
 PLATFORMS
   ruby
@@ -259,9 +317,9 @@ DEPENDENCIES
   aasm
   acts_as_list!
   ancestry
-  awesome_print
   better_errors
   binding_of_caller
+  blockuijs-rails!
   bootstrap-sass
   coffee-rails (~> 4.0.0)
   devise
@@ -272,6 +330,7 @@ DEPENDENCIES
   gollum-lib
   haml-contrib
   haml-rails
+  jazz_hands
   jbuilder (~> 1.2)
   jquery-rails
   kaminari
@@ -279,10 +338,9 @@ DEPENDENCIES
   mysql2
   omniauth-openid
   plupload-rails
-  pry
-  pry-remote
   public_activity
   rack-mini-profiler
+  rails!
   rails-assets-backbone
   rails-assets-highlightjs
   rails-assets-jquery-autosize

data/app/assets/javascripts/application.js

@@ -27,5 +27,6 @@
 //= require jquery-autosize
 //= require rails-timeago
 //= require underscore
+//= require jquery.blockUI
 //= require backbone
 //= require backbone/tawork

data/app/controllers/wiki/pages_controller.rb

@@ -46,7 +46,7 @@ class Wiki::PagesController < ApplicationController
     if (params[:timestamp].present? && @page.last_updated.present?) && 
       ((params[:timestamp].present? && !@page.last_updated.present?) ||
       @page.last_updated.try(:created_at) != Time.parse(params[:timestamp]))
-      @page.errors.add(:base, "This page was edited by someone. Please refresh.")
+      @page.errors.add(:base, "This page was edited by someone. Please refresh to get the updated changes. Refreshing the page will remove the your changes.")
     end
 
     if @page.errors.none? && @page.update_attributes(update_params)

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

@@ -125,11 +125,14 @@
       title = tinyMCE.get("wiki-title").getContent()
       body = tinyMCE.get("wiki-content").getContent()
       markdown_body = $("#markdown_body").val()
+      $.blockUI(message: "")
 
       $.ajax
         type: $(this).data("type")
         url: $(this).data("url")
         success: ->
+        complete: ->
+          $.unblockUI()
 
         data:
           timestamp: $(".time").data("timestamp")

data/config/initializers/gollum.rb

@@ -20,10 +20,7 @@ module Gollum
     def normalize(data)
       return data.read if data.respond_to?(:read)
 
-      Rails.logger.info data
       result = data.try(:gsub, /\r/, '')
-      Rails.logger.info "DATA"
-      Rails.logger.info data
       result
     end
   end

data/lib/tawork/version.rb

@@ -1,3 +1,3 @@
 module Tawork
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tawork
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Adnan Ali
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails