clwiki 2.0.1 → 2.1.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6ca0f95c1cee67ba052c408772649205091c3685
+  data.tar.gz: 7dcb32bc57a5d415a8aa3f3f78d82f4fc7a134b1
+SHA512:
+  metadata.gz: 94f2f07e9a334f66d4e46a688ed0fa7f1a702870a7c53c702f23024c858365ddff1838f8cf4df253b43a21933f0c366d997c7f0b6be0d16989cf3107619b007e
+  data.tar.gz: 3e3bc9c1796918b8b521085d64c4cd55487b0141786e9fa5eabe518c65663c39c82e5491820ca8e3cb0168e46a52e3fe4629957c981acc03e6da761f900f4177

data/app/views/cl_wiki/page/edit.html.erb

@@ -1,8 +1,8 @@
 <%= form_tag(page_show_path(:page_name => @page.full_name)) do %>
   <%= hidden_field_tag 'client_mod_time', @page.mtime.to_i.to_s %>
 
-  <%= text_area_tag 'page_content', CGI.escapeHTML(@page.raw_content), rows: $wiki_conf.edit_rows, cols: $wiki_conf.edit_cols %>
+  <%= text_area_tag 'page_content', @page.raw_content, rows: $wiki_conf.edit_rows, cols: $wiki_conf.edit_cols %>
   <br/>
   <%= submit_tag 'Save', name: 'save' %>
   <%= submit_tag 'Save and Continue Editing', name: 'save_and_edit' %>
-<% end %>
+<% end %>

data/app/views/cl_wiki/page/recent.html.erb

@@ -1,4 +1,6 @@
 <% @pages.each do |page| %>
-  <%= @formatter.convertToLink(page.name).html_safe %>
+  <div class='wikiHeader'>
+    <span class='pageName'><%= @formatter.convertToLink(page.name).html_safe %></span>
+  </div>
   <%= page.content.html_safe %>
 <% end %>

data/lib/cl_wiki/engine.rb

@@ -1,5 +1,9 @@
 module ClWiki
   class Engine < ::Rails::Engine
     isolate_namespace ClWiki
+
+    initializer 'cl_wiki.assets.precompile' do |app|
+      app.config.assets.precompile += %w(application.css application.js)
+    end
   end
-end
+end

data/lib/cl_wiki/file.rb

@@ -1,6 +1,8 @@
 require 'fileutils'
 require 'time'
 
+require_relative 'page'
+
 $wikiPageExt = '.txt'
 
 module ClWiki
@@ -148,8 +150,22 @@ module ClWiki
       current_mtime = ::File.open(file_name) do |f|
         f.mtime
       end
-      if mtime_to_compare != current_mtime
-        raise FileModifiedSinceRead, "File has been modified since it was last read."
+      compare_read_times!(mtime_to_compare, current_mtime)
+    end
+
+    def self.compare_read_times!(a, b)
+      # ignore usec
+      a = Time.new(a.year, a.month, a.day, a.hour, a.min, a.sec)
+      b = Time.new(b.year, b.month, b.day, b.hour, b.min, b.sec)
+      if a != b
+        raise FileModifiedSinceRead, "File has been modified since it was last read. #{dump_time(a)} != #{dump_time(b)}"
+      end
+    end
+
+    def self.dump_time(time)
+      ''.tap do |s|
+        s << "#{time}"
+        s << ".#{time.usec}" if time.respond_to?(:usec)
       end
     end
 

data/lib/cl_wiki/version.rb

@@ -1,3 +1,3 @@
 module ClWiki
-  VERSION = '2.0.1'
-end
+  VERSION = '2.1.6'
+end

data/test/dummy/config/environments/production.rb

@@ -20,7 +20,7 @@ Dummy::Application.configure do
   # config.action_dispatch.rack_cache = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
+  config.serve_static_files = false
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor  = :uglifier

data/test/dummy/config/environments/test.rb

@@ -13,7 +13,7 @@ Dummy::Application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets = true
+  config.serve_static_files = true
   config.static_cache_control = "public, max-age=3600"
 
   # Show full error reports and disable caching.

data/test/dummy/config/initializers/session_store.rb

@@ -1,3 +1,3 @@
 # Be sure to restart your server when you modify this file.
 
-Dummy::Application.config.session_store :encrypted_cookie_store, key: '_dummy_session'
+#Dummy::Application.config.session_store :encrypted_cookie_store, key: '_dummy_session'