Wiki2Go 1.17.0 → 1.17.1

data/lib/Wiki2Go/Install/templates/admin_pages/edit.txt

@@ -1,7 +1,12 @@
 <%
    require 'Wiki2Go/WikiFormatter'
+
+   def show_directory(dirname,label)
+     "<a href=\"#{ @formatter.make_verb_url('admin','editfiles')}?dir=#{CGI::escape(dirname)}\">&gt;#{label}</a>"
+   end
+
    
-   formatter = Wiki2Go::Formatter.new(@web,@config.storage,@config,true,@config.editable?(@web))
+   @formatter = Wiki2Go::Formatter.new(@web,@config.storage,@config,true,@config.editable?(@web))
 
    message = ''
    file = @request.parameter('file',nil)
@@ -28,7 +33,9 @@
 %>
 <h3>Edit File</h3>
 <%= message %>
-<form action="<%= formatter.make_verb_url('admin','edit')%>" method="post">
+<hr>
+<%= show_directory(File.dirname(file),"Back to #{File.dirname(file)}") %> 
+<form action="<%= @formatter.make_verb_url('admin','edit')%>" method="post">
   <input type="hidden" name="file" value="<%= file %>">
   <textarea name="text" rows="35" cols="96"><%= content %></textarea><br>
   <button type="submit" name="update" value="update">

data/test/TestDot.rb

@@ -47,7 +47,7 @@ class TestDot <  Test::Unit::TestCase
     graphics = Wiki2Go::DotGraphics.new('')
     processed = graphics.save(@config,@web,content)
     expected = expected_mapped_file
-    assert_same_strings(expected,processed)
+    assert_same_strings_as_regexp(expected,processed)
     assert(File.exists?(outfile))
   end
 
@@ -61,10 +61,15 @@ class TestDot <  Test::Unit::TestCase
     graphics = Wiki2Go::DotGraphics.new('')
     processed = graphics.save(@config,@web,content)
     expected = expected_rewritten_urls
-    assert_same_strings(expected,processed)
+    assert_same_strings_as_regexp(expected,processed)
     assert(File.exists?(outfile))
   end
 
+  def test_expr
+      assert "hello 123" =~ Regexp.new(" \\d")
+      assert '<area shape="rect" href="http://wiki2go.nayima.be" title="Hello" alt="" coords="9,7,87,55" />' =~ Regexp.new('<area shape="rect" href="http://wiki2go.nayima.be" title="Hello" alt="" coords="\d,7,87,55" />') ;
+  end
+  
   private
 
   def content_for_mapping
@@ -80,7 +85,7 @@ digraph G {
     return <<-END_OF_EXPECTED
 <img src="Wiki2Go/graphics/test.gif" border=0 alt="test.gif" usemap="#test">
 <map id="test" name="test">
-<area shape="rect" href="http://wiki2go.nayima.be" title="Hello" alt="" coords="10,8,88,56" />
+<area shape="rect" href="http://wiki2go.nayima.be" title="Hello" alt="" coords="\\d+,\\d+,\\d+,\\d+" />
 </map>
 END_OF_EXPECTED
   end
@@ -100,8 +105,8 @@ END_OF_CONTENT
     return <<-END_OF_EXPECTED
 <img src="Wiki2Go/graphics/test.gif" border=0 alt="test.gif" usemap="#test">
 <map id="test" name="test">
-<area shape="rect" href="http://localhost/redirect/Wiki2Go?url=http%3A%2F%2Fwiki2go.nayima.be" title="Hello" alt="" coords="10,8,88,56" />
-<area shape="rect" href="http://localhost/Wiki2Go/Some/WikiPage.html" title="World" alt="" coords="8,104,90,152" />
+<area shape="rect" href="http://localhost/redirect/Wiki2Go\\?url=http%3A%2F%2Fwiki2go.nayima.be" title="Hello" alt="" coords="\\d+,\\d+,\\d+,\\d+" />
+<area shape="rect" href="http://localhost/Wiki2Go/Some/WikiPage.html" title="World" alt="" coords="\\d+,\\d+,\\d+,\\d+" />
 </map>
 END_OF_EXPECTED
   end

data/test/UnitTestFiles.rb

@@ -60,10 +60,30 @@ module UnitTestFiles
     end
   end
 
+  def assert_same_regexp(expected_lines,actual_lines,replace=nil)
+    #    assert_equal(expected_lines.length,actual_lines.length,"Files to compare have different length")
+    for i in 0...expected_lines.length
+      expected = expected_lines[i]
+      actual = actual_lines[i]
+      if ! replace.nil? then
+        replace.each do |key,value |
+          expected.gsub!(key,value)
+        end
+      end
+
+      expected_regexp = Regexp.new(expected.strip)
+      assert(actual.strip =~ expected_regexp,"Line #{i}:\n'#{actual}' does not match \n#{expected_regexp.inspect}")
+    end
+  end
+
   def assert_same_strings(expected,actual,replace=nil)
     assert_same_content(expected.split($/),actual.split($/),replace)
   end
 
+  def assert_same_strings_as_regexp(expected,actual,replace=nil)
+    assert_same_regexp(expected.split($/),actual.split($/),replace)
+  end
+
   def assert_same_markup_strings(expected,actual,replace=nil)
     expected = expected.split($/).collect {|line| line.strip }
     actual   = actual.split($/).collect {|line| line.strip }

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.8.10
 specification_version: 1
 name: Wiki2Go
 version: !ruby/object:Gem::Version 
-  version: 1.17.0
-date: 2005-10-22 00:00:00 +02:00
+  version: 1.17.1
+date: 2005-12-09
 summary: Wiki2Go is a Ruby Wiki
 require_paths: 
   - lib
@@ -26,8 +26,6 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
         version: 0.0.0
   version: 
 platform: ruby
-signing_key: 
-cert_chain: 
 authors: 
   - Pascal Van Cauwenberghe
 files: