tawork 0.0.36 → 0.0.37

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWNjYjBmNjRiNGUxMWIyNWUwNzIzZTc2MTBiYWQyNDc0Mzc2MThjNg==
+    NjlkYTE3YTE3OTdlZjJiNGE5NGRjYWQxOTE0MjkxZjFmNTY0YWZkMQ==
   data.tar.gz: !binary |-
-    Yjc4MGVjNmYwZGJiMjQ5ZGM3ZDc4MWFkZWQzZTliZWQwNzliZDQ2OA==
+    MGE2M2MyYzcwNTMwZDgwNGJhZDgxOTk3NWU2MmM2N2Q4NWY4ZTRlZA==
 SHA512:
   metadata.gz: !binary |-
-    NzUyMDdiNGJkNzY1NWUwNDA1NWIyYzllZTc5YzM4NTQ2NzAyZjdhNzVhZGY4
-    MTZhNGVjODZlNjVlZTBmZmMxN2MzYTJlZTYxN2IxNmU4YTZjYWQ0MjYyMWNm
-    ODE1Zjk3ZDA1MTg0YWJlMzY1YTIxMGYwMmI2MTVhYjcwZjA0NWQ=
+    YmJhZGM3N2Q2NWI5NGVlMTRmOTU4NTNiYjkxZTE3NmUyYjcxZTU1ODllMGI0
+    OGM2MzRkNzE3YzY3YzQwZmM3NGI4OTY4ODJkMGJhYWJkOTAwODFlNTFkMTM5
+    N2EwYWJhMjk5YTVkODkwYjQyOTFjYzhiZTkzNzE1NDVmNTM4ODk=
   data.tar.gz: !binary |-
-    OWJjOTZkMjMzYzU1Y2E3MzU1Njg5ZjdjMTQ2YTYzMGI3OWViOGFkOGYzMzk3
-    OTczYjNlN2Q4OWJjZGNhMTg2MzJlYTY3NGE5N2ZhNzM1NmRkYzA1YTc3YTA4
-    OGRkNGRkM2NmMjkwMTMwZDQ5NzI2M2FhYjg2MGUwMDIyYjE1MzI=
+    ODY3YWU0MDA3ZDA5OWZkMTNhNzE2ZGJjMDA2MmY3NzE3MTQ2NmYwM2FjNWFj
+    Yzc3OGVlYTVjZjExODcyOTVlYjczM2ViYzg2Y2Q1MGU4ZDRjODlkZjdkMWZj
+    NWFkYTdlYThmZmUwYTBhNTdmNGRkMjZkOTg4N2Q1MTM2M2E1MmM=

data/Gemfile

@@ -28,6 +28,7 @@ gem 'acts-as-taggable-on'
 gem 'public_activity'
 gem 'diffy'
 gem 'gollum-lib'
+gem 'daisydiff'
 
 gem 'RedCloth'
 gem 'github-markdown'

data/Gemfile.lock

@@ -94,6 +94,10 @@ GEM
       sass (~> 3.2)
     builder (3.2.2)
     charlock_holmes (0.6.9.4)
+    climate_control (0.0.3)
+      activesupport (>= 3.0)
+    cocaine (0.5.3)
+      climate_control (>= 0.0.3, < 1.0)
     coderay (1.1.0)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
@@ -105,6 +109,9 @@ GEM
     columnize (0.3.6)
     coolline (0.4.3)
     daemons (1.1.9)
+    daisydiff (0.0.1)
+      cocaine (>= 0.5.1)
+      nokogiri (>= 1.4.2)
     debug_inspector (0.0.2)
     debugger (1.6.6)
       columnize (>= 0.3.1)
@@ -337,6 +344,7 @@ DEPENDENCIES
   blockuijs-rails!
   bootstrap-sass
   coffee-rails (~> 4.0.0)
+  daisydiff
   devise
   diffy
   docsplit

data/app/assets/stylesheets/bootstrap_and_overrides.sass

@@ -311,3 +311,10 @@ div.tokenfield.form-control
   font-size: .75em
   color: lighten(red, 15)
 
+.compare-column
+  min-height: 300px
+  border-right: 1px solid gray
+  border-left: 1px solid gray
+  img
+    width: 100%
+    max-width: 100%

data/app/assets/stylesheets/diff.css

@@ -12,3 +12,27 @@
 .diff ins strong{font-weight:normal;background:#9f9;}
 .diff li.diff-comment { display: none; }
 .diff li.diff-block-info { background: none repeat scroll 0 0 gray; }
+
+span.diff-html-removed {
+  background: #fcc;
+  /* text-decoration: line-through; */
+  cursor: default;
+} 
+
+span.diff-html-added {
+  background: #9f9;
+  cursor: default;
+} 
+
+span.diff-html-changed {
+  border-bottom: dotted 2px red;
+  cursor: default;
+}
+
+[changetype="diff-added-image"] {
+  border: dotted 2px #9f9;
+}
+
+[changetype="diff-removed-image"] {
+  border: dotted 2px #fcc;
+}

data/app/controllers/wiki/pages_controller.rb

@@ -30,6 +30,24 @@ class Wiki::PagesController < ApplicationController
   def history
   end
 
+  def compare
+    version = @page.versions.select{|x| x.sha == params[:version]}.first
+    filename = version.show.first.b_path
+
+    #TODO: should cache the diffs (store on save page in delayed job)
+    @old_html = version.repo.git.show({}, "#{version.sha}~1:#{filename}").force_encoding('UTF-8')
+    @new_html = version.repo.git.show({}, "#{version.sha}:#{filename}").force_encoding('UTF-8')
+
+    giri = Nokogiri::HTML(DaisyDiff.strings(@old_html, @new_html))
+    @diff_html = giri.css("body")
+    @diff_html.css(".diffpage-html-firstlast").remove
+    @diff_html.css("script").remove
+    @diff_html.xpath('//@onclick').remove
+    @diff_html.xpath('//@onload').remove
+    @diff_html.xpath('//@onerror').remove
+    @diff_html.xpath('//@onabort').remove
+  end
+
   def combined
     @subtree = @page.subtree.arrange
     render layout: "minimal"

data/app/helpers/tawork/application_helper.rb

@@ -21,6 +21,7 @@ module Tawork
 
     def title(page_title)
       content_for(:title) { page_title }
+      page_title
     end
 
     def icon_for(thing)
@@ -35,5 +36,13 @@ module Tawork
 
       tag(:i, class: "fa fa-#{icon}")
     end
+
+    def body_layout
+      if params[:controller] == "wiki/pages" && params[:action] == "compare"
+        return "layouts/compare_layout"
+      end
+
+      "layouts/default_layout"
+    end
   end
 end

data/app/views/layouts/_compare_layout.html.haml

@@ -0,0 +1,3 @@
+.container-fluid
+  .row
+    = yield

data/app/views/layouts/_default_layout.html.haml

@@ -0,0 +1,26 @@
+.container-fluid
+  .row
+    .col-md-9.col-md-offset-3 
+      - if notice.present?
+        .alert.alert-success= notice
+      - if alert.present?
+        .alert.alert-error= alert
+
+.container-fluid
+  .row
+    .col-md-3.sidebar
+      - if current_user.present?
+        = render 'layouts/spaces'
+
+        - if TAWORK_CONFIG["show_projects"].nil? || TAWORK_CONFIG["show_projects"]
+          %ul.nav.nav-list.nav-list-panel
+            %li.nav-header 
+              Projects
+            - Project.all.each do |project|
+              %li 
+                = link_to project.title, project_path(project)
+            %li
+              = link_to new_project_path do 
+                %i.fa.fa-plus
+    .col-md-9.col-md-offset-3 
+      = yield

data/app/views/layouts/application.html.haml

@@ -15,32 +15,6 @@
 
   %body
     = render 'layouts/nav_header'
-
-    .container-fluid
-      .row
-        .col-md-9.col-md-offset-3 
-          - if notice.present?
-            .alert.alert-success= notice
-          - if alert.present?
-            .alert.alert-error= alert
-                  
-    .container-fluid
-      .row
-        .col-md-3.sidebar
-          - if current_user.present?
-            = render 'layouts/spaces'
-
-            - if TAWORK_CONFIG["show_projects"].nil? || TAWORK_CONFIG["show_projects"]
-              %ul.nav.nav-list.nav-list-panel
-                %li.nav-header 
-                  Projects
-                - Project.all.each do |project|
-                  %li 
-                    = link_to project.title, project_path(project)
-                %li
-                  = link_to new_project_path do 
-                    %i.fa.fa-plus
-        .col-md-9.col-md-offset-3 
-          = yield
+    = render body_layout
 
     #global-autocomplete-results

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

@@ -0,0 +1,19 @@
+.col-md-12
+  - page_title = title "Comparing version #{params[:version]} for #{@page.title}"
+  = render 'breadcrumb', link_last: true
+
+  = link_to "Back to History", history_wiki_page_path(@page), class: "btn btn-primary"
+
+
+  %h2 
+    #{@page.title}
+    %small= params[:version]
+
+  %hr/
+
+.col-md-6.compare-column
+  #wiki-content.wiki-content.content-description
+    = raw @old_html
+.col-md-6.compare-column
+  #wiki-content.wiki-content.content-description
+    = raw @diff_html

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

@@ -2,13 +2,14 @@
 = render 'breadcrumb', link_last: true
 
 %h2 History
-- @page.versions.each do |version|
-  .media
-    - version.diffs.each do |diff|
-      %a.pull-left{:href => "#"}
-      .media-body
-        %h4.media-heading Date: #{version.authored_date}
 
-        - diffy = Diffy::Diff.new("", "")
-        - diffy.instance_variable_set(:@diff, diff.diff)
-        =raw Diffy::HtmlFormatter.new(diffy, highlight_words: true, include_plus_and_minus_in_html: true).to_s
+%table.table
+  %tr
+    %th Author
+    %th Date
+    %th
+  - @page.versions.each do |version|
+    %tr
+      %td= version.author
+      %td= version.authored_date.to_s(:long)
+      %td= link_to "Compare", compare_wiki_page_path(@page, version: version.sha)

data/config/routes.rb

@@ -22,6 +22,7 @@ Rails.application.class.routes.draw do
         get :subpages_dropdown
         get :combined
         get :history
+        get :compare
         post :reorder
         post :star
         post :add_tag

data/lib/tawork/version.rb

@@ -1,3 +1,3 @@
 module Tawork
-  VERSION = '0.0.36'
+  VERSION = '0.0.37'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tawork
 version: !ruby/object:Gem::Version
-  version: 0.0.36
+  version: 0.0.37
 platform: ruby
 authors:
 - Adnan Ali
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -112,6 +112,8 @@ files:
 - app/views/devise/unlocks/new.html.erb
 - app/views/home/index.html.haml
 - app/views/layouts/_activity_wrapper.html.haml
+- app/views/layouts/_compare_layout.html.haml
+- app/views/layouts/_default_layout.html.haml
 - app/views/layouts/_nav_header.html.haml
 - app/views/layouts/_spaces.html.haml
 - app/views/layouts/application.html.haml
@@ -164,6 +166,7 @@ files:
 - app/views/wiki/pages/_tree_node.html.haml
 - app/views/wiki/pages/attach.js.coffee
 - app/views/wiki/pages/combined.html.haml
+- app/views/wiki/pages/compare.html.haml
 - app/views/wiki/pages/create.js.coffee
 - app/views/wiki/pages/edit.html.haml
 - app/views/wiki/pages/history.html.haml