clwiki 2.1.7 → 2.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6e9efc6da1d447b2e24d81b9cb8eb58dbf90550
-  data.tar.gz: d09c915cf6b3eb903ad05a738827838c5c82a6ee
+  metadata.gz: f84cec3fab1f7ecb7ac62119bbe082fbbb9fe4f0
+  data.tar.gz: eee6a2eb5655c377bc6e9459474baa14676ea850
 SHA512:
-  metadata.gz: 82824c73dbf3efb65f7c4801569d91e4bd9b0780cda350d4f4d7e13106d1bb410af8eea8410f1da8f0ef656793e8c0e4ec9dc3e730cbcfc684cac43382c8401d
-  data.tar.gz: 0d8aa91d61132b9c52446b0fbb7a777efc10f8e3d5f16b72494c1f0e79c202500eb0b50975aa7337c56851ef9541ea9982fa70a3f57ba319eecec4a933c3cb91
+  metadata.gz: a24293e23531ea25fb1516ce3a5b5271a6bb2312c7aa8f867c3b134180b70be2c45771e548fea4dad77930c0178433f9ee55aa8464d75ffc051a560ef7df0483
+  data.tar.gz: a98cd414bc6c3d60e9a03d49a005b9f563dc260fde53b123f9a132cdb0496e052e7d324ef94a008bd45e839bf7ad27641f967e12db20a574078a2c8fc6ceab30

data/lib/cl_wiki/file.rb

@@ -7,7 +7,7 @@ $wikiPageExt = '.txt'
 
 module ClWiki
   class File
-    attr_reader :name, :fileExt, :wikiRootPath, :pagePath, :modTimeAtLastRead
+    attr_reader :name, :fileExt, :wikiRootPath, :pagePath, :modTimeAtLastRead, :metadata
     attr_accessor :clientLastReadModTime
 
     def initialize(fullPageName, wikiRootPath, fileExt=$wikiPageExt, autocreate=true)
@@ -19,6 +19,7 @@ module ClWiki
       @pagePath = '/' if @pagePath == '.'
       @fileExt = fileExt
       @metadata = {}
+      @metadata_keys = ['mtime']
       if autocreate
         if file_exists?
           readFile
@@ -121,25 +122,32 @@ module ClWiki
       raw_lines.each_with_index do |ln, index|
         if ln.chomp.empty?
           next_line = raw_lines[index+1]
-          if (next_line.nil? || next_line.chomp.empty?) &&
-            all_lines_are_metadata_lines(raw_lines[0..index-1])
-            start_index = index + 2
+          if next_line.nil? || next_line.chomp.empty?
+            if all_lines_are_metadata_lines(raw_lines[0..index-1])
+              start_index = index + 2
+            end
             break
           end
         end
       end
-      [raw_lines[0..start_index-3], raw_lines[start_index..-1]]
+
+      if start_index > 0
+        [raw_lines[0..start_index-3], raw_lines[start_index..-1]]
+      else
+        [[], raw_lines]
+      end
     end
 
     def all_lines_are_metadata_lines(lines)
-      lines.map { |ln| ln =~ /\w+: / }.uniq == [0]
+      lines.map { |ln| ln.scan(/\A(\w+):?/) }.flatten.
+        map { |k| @metadata_keys.include?(k) }.uniq == [true]
     end
 
     def read_metadata(lines)
       @metadata = {}
       lines.each do |ln|
         key, value = ln.split(': ')
-        @metadata[key] = value
+        @metadata[key] = value if @metadata_keys.include?(key)
       end
     end
 

data/lib/cl_wiki/version.rb

@@ -1,3 +1,3 @@
 module ClWiki
-  VERSION = '2.1.7'
+  VERSION = '2.1.8'
 end

data/test/dummy/log/test.log

@@ -3327,3 +3327,81 @@ Processing by ClWiki::PageController#show as HTML
 Redirected to http://test.host/wiki/FrontPage
 Filter chain halted as :redirect_to_front_page_if_bad_name rendered or redirected
 Completed 302 Found in 0ms
+Started GET "/wiki/clwikicgi.rb?use_route=cl_wiki&page=%2FChrisMorris&edit=true" for 127.0.0.1 at 2015-09-23 00:10:46 -0500
+Processing by ClWiki::PageController#show as HTML
+  Parameters: {"use_route"=>"cl_wiki", "page"=>"/ChrisMorris", "edit"=>"true"}
+Redirected to http://www.example.com/wiki/ChrisMorris/edit
+Filter chain halted as :redirect_legacy_cgi_urls rendered or redirected
+Completed 301 Moved Permanently in 10ms
+Started GET "/wiki/clwikicgi.rb?use_route=cl_wiki&page=%2FSomeParent%2FDotTest" for 127.0.0.1 at 2015-09-23 00:10:46 -0500
+Processing by ClWiki::PageController#show as HTML
+  Parameters: {"use_route"=>"cl_wiki", "page"=>"/SomeParent/DotTest"}
+Redirected to http://www.example.com/wiki/DotTest
+Filter chain halted as :redirect_legacy_cgi_urls rendered or redirected
+Completed 301 Moved Permanently in 0ms
+Started GET "/wiki/clwikicgi.rb?use_route=cl_wiki&page=ChrisMorris" for 127.0.0.1 at 2015-09-23 00:10:46 -0500
+Processing by ClWiki::PageController#show as HTML
+  Parameters: {"use_route"=>"cl_wiki", "page"=>"ChrisMorris"}
+Redirected to http://www.example.com/wiki/ChrisMorris
+Filter chain halted as :redirect_legacy_cgi_urls rendered or redirected
+Completed 301 Moved Permanently in 0ms
+Started GET "/wiki/clwikicgi.rb?use_route=cl_wiki&page=%2FChrisMorris" for 127.0.0.1 at 2015-09-23 00:10:46 -0500
+Processing by ClWiki::PageController#show as HTML
+  Parameters: {"use_route"=>"cl_wiki", "page"=>"/ChrisMorris"}
+Redirected to http://www.example.com/wiki/ChrisMorris
+Filter chain halted as :redirect_legacy_cgi_urls rendered or redirected
+Completed 301 Moved Permanently in 0ms
+Processing by ClWiki::PageController#recent as RSS
+  Rendered /Users/chrismo/modev/clwiki/app/views/cl_wiki/page/recent.rss.builder (0.2ms)
+Completed 200 OK in 15ms (Views: 11.9ms)
+Processing by ClWiki::PageController#show as HTML
+  Parameters: {"page_name"=>"NewPage"}
+Redirected to http://test.host/wiki/FrontPage
+Filter chain halted as :redirect_to_front_page_if_bad_name rendered or redirected
+Completed 302 Found in 1ms
+Processing by ClWiki::PageController#edit as HTML
+  Parameters: {"page_name"=>"NewPage"}
+  Rendered /Users/chrismo/modev/clwiki/app/views/cl_wiki/page/edit.html.erb within layouts/cl_wiki/application (0.2ms)
+Completed 200 OK in 6ms (Views: 4.7ms)
+Processing by ClWiki::PageController#update as HTML
+  Parameters: {"page_content"=>"NewPage content", "client_mod_time"=>"1442985046", "save_and_edit"=>true, "page_name"=>"NewPage"}
+Redirected to http://test.host/wiki/NewPage/edit
+Completed 302 Found in 2ms (Views: 4.7ms)
+Processing by ClWiki::PageController#recent as HTML
+  Rendered /Users/chrismo/modev/clwiki/app/views/cl_wiki/page/recent.html.erb within layouts/cl_wiki/application (0.2ms)
+Completed 200 OK in 4ms (Views: 2.0ms)
+Processing by ClWiki::PageController#recent as HTML
+  Rendered /Users/chrismo/modev/clwiki/app/views/cl_wiki/page/recent.html.erb within layouts/cl_wiki/application (0.2ms)
+Completed 200 OK in 2ms (Views: 0.8ms)
+Processing by ClWiki::PageController#find as HTML
+  Parameters: {"search_text"=>"sheep"}
+  Rendered /Users/chrismo/modev/clwiki/app/views/cl_wiki/page/find.html.erb within layouts/cl_wiki/application (0.2ms)
+Completed 200 OK in 3ms (Views: 2.1ms)
+Processing by ClWiki::PageController#show as HTML
+  Parameters: {"page_name"=>"NewPage"}
+  Rendered /Users/chrismo/modev/clwiki/app/views/cl_wiki/page/show.html.erb within layouts/cl_wiki/application (0.2ms)
+Completed 200 OK in 4ms (Views: 2.2ms)
+Processing by ClWiki::PageController#show as HTML
+Redirected to http://test.host/wiki/FrontPage
+Filter chain halted as :redirect_to_front_page_if_bad_name rendered or redirected
+Completed 302 Found in 0ms
+Processing by ClWiki::PageController#find as HTML
+  Rendered /Users/chrismo/modev/clwiki/app/views/cl_wiki/page/find.html.erb within layouts/cl_wiki/application (0.2ms)
+Completed 200 OK in 1ms (Views: 0.6ms)
+Processing by ClWiki::PageController#edit as HTML
+  Parameters: {"page_name"=>"NewPage"}
+  Rendered /Users/chrismo/modev/clwiki/app/views/cl_wiki/page/edit.html.erb within layouts/cl_wiki/application (0.2ms)
+Completed 200 OK in 2ms (Views: 0.8ms)
+Processing by ClWiki::PageController#update as HTML
+  Parameters: {"page_content"=>"NewPage content", "client_mod_time"=>"1442985046", "page_name"=>"NewPage"}
+Redirected to http://test.host/wiki/NewPage
+Completed 302 Found in 2ms (Views: 0.8ms)
+Processing by ClWiki::PageController#edit as HTML
+  Parameters: {"page_name"=>"NewPage"}
+  Rendered /Users/chrismo/modev/clwiki/app/views/cl_wiki/page/edit.html.erb within layouts/cl_wiki/application (0.2ms)
+Completed 200 OK in 2ms (Views: 0.7ms)
+Processing by ClWiki::PageController#show as HTML
+  Parameters: {"page_name"=>"notavalidname"}
+Redirected to http://test.host/wiki/FrontPage
+Filter chain halted as :redirect_to_front_page_if_bad_name rendered or redirected
+Completed 302 Found in 0ms

data/test/lib/clwiki/file_test.rb

@@ -108,5 +108,18 @@ class TestClWikiFile < TestBase
     end
     wiki_file = ClWiki::File.new("/LegacyPage", @test_wiki_path)
     assert_equal "First line\n\n\nAfter the big break\n", wiki_file.content.join
+    assert_equal({}, wiki_file.metadata)
+  end
+
+  def test_mid_mtime_not_parsed_as_metadata
+    File.open(File.join(@test_wiki_path, 'LegacyPage.txt'), 'w') do |f|
+      f.puts "a"
+      f.puts "mtime: 2015-09-22"
+      f.puts "\n\n"
+      f.puts "b"
+    end
+    wiki_file = ClWiki::File.new("/LegacyPage", @test_wiki_path)
+    assert_equal "a\nmtime: 2015-09-22\n\n\nb\n", wiki_file.content.join
+    assert_equal({}, wiki_file.metadata)
   end
 end

data/test/lib/clwiki/test_base.rb

@@ -15,7 +15,12 @@ class TestBase < TempDirTest
     $wiki_conf.wiki_path = $wiki_path
     $wiki_conf.useIndex = ClWiki::Configuration::USE_INDEX_NO
   end
-  
+
+  def override_wiki_path(path)
+    $wiki_path = path
+    $wiki_conf.wiki_path = path
+  end
+
   # to ward off the new Test::Unit detection of classes with no test
   # methods
   def default_test

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clwiki
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.1.8
 platform: ruby
 authors:
 - chrismo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-22 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clutil