elexis-wiki-interface 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39023cc608821f4d521e4ecbc6bbced22b04bed5
-  data.tar.gz: 53d24e645de05ca3ebbb95d7ead6095de2ec9501
+  metadata.gz: e9d72d912fd4a22ecaf2edbf49da976269fc25e8
+  data.tar.gz: fb88d025c7dfedd98f704a8cbf3fa3a3013dc457
 SHA512:
-  metadata.gz: 0dca8f432c28684fff8170c702b2efbbbea0a4bdec271b36eeeaf42116569f203c72715eb212cebce13c8738495bd97d2d998f84ca8be12ffdc0924bbc940280
-  data.tar.gz: 42a2159ea7d141b3b4e72c6bceb4a6c552a415f21ad2a7b3d24bced1c35c5423212ff40182ec11c5072e1275c86edb26ddc2033ed10537503c0087691ed4ffd2
+  metadata.gz: 805a7d07ade2e96a7500819ae6a83c0cb13db5fc0b48eff63da2b59e05385924e2fb634f7bdee8a76eb00c4a801c3af5ffeac1fd96c0dff97dc6519420a3bcb5
+  data.tar.gz: e4b562ca6ea1278aa1e9f4c313147d6843494e2ad97d571a476ce6c336e4a032fa64c7e958504c83e67e0b1191c9c512067eba913125493d86579bd3bec10cff

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    elexis-wiki-interface (0.5.2)
+    elexis-wiki-interface (0.5.3)
       eclipse-plugin (>= 0.1)
       mediawiki-gateway
       mediawiki_api

data/history.textile

@@ -1,3 +1,8 @@
+h3. Version 0.5.3 (2015-10-29)
+
+* Remove dummy UTF-8 characters
+* Fix mediawiki files which reference images containing '/' and ':'
+
 h3. Version 0.5.2 (2015-10-29)
 
 * Correctly rename picture with ':' and '/'.

data/lib/elexis/wiki/images.rb

@@ -22,7 +22,8 @@ end
 
 module Elexis
   module Wiki
-    ImagePattern = /(\[File:|Datei:|\[Image:)(?:[^\/:]*\/)?([ \w\.:\/-]*)([^\]\|]*)/
+    ImageWithSlashPattern = /(\[File:|Datei:|\[Image:)([^\/:\]]*[:\/])([\w.-]+)/
+    ImagePattern = /(\[File:|\[Datei:|\[Image:)((?:.+:|)[^\/:|]*)/
 
     #
     # This helper class collect information about all images used in
@@ -190,8 +191,9 @@ module Elexis
 
       def get_name_with_project(path)
         prefix =Images.get_project_abbreviation(path)
-        result = (prefix + '-' + File.basename(path)).downcase.gsub(':', '-')
-        result
+        basename = File.basename(path)
+        result = /^#{prefix}/i.match(basename) ? basename : (prefix + '-' + basename).gsub(':', '-')
+        result.downcase
       end
 
       def Images.get_small_name(path)
@@ -307,6 +309,7 @@ module Elexis
                           run_git_cmd("git rm -f --ignore-unmatch #{picture[:path]}", true) if picture[:path] != new_path
                          }
         @actions.uniq!
+        cleanup_mediawikis
         puts @actions.join("\n")
       ensure
         Dir.chdir(savedDir)
@@ -332,32 +335,90 @@ module Elexis
         lines = IO.readlines(mediawiki_file)
         lines.each{
           |line|
-          unless m = ImagePattern.match(line)
-            newLines << line
-          else
-            unless old_image_name.downcase.eql?(m[2].downcase) or  /\/#{old_image_name}/i.match(m[2])
-              puts "change_image_name_in_mediawiki #{__LINE__}  skip #{m}" if $VERBOSE
-              newLines << line
-            else
+          image_name = nil
+          if m = ImageWithSlashPattern.match(line)
+            image_name = m[2] + m[3]
+          elsif m = ImagePattern.match(line)
+            image_name = m[2]
+          end
+          unless image_name
+            newLines << fix_line(line)
+            next;
+          end
+          if old_image_name.downcase.eql?(image_name.downcase) or/\/#{old_image_name}/i.match(image_name)
               dirName = File.dirname(mediawiki_file)
               simpleName = File.join(dirName, File.basename(new_image_name))
+              raise "Could not find image" unless File.exists?(new_image_name)
               if files = Dir.glob(simpleName, File::FNM_CASEFOLD) and files.size >= 1
-              # if files = (Dir.glob(simpleName, File::FNM_CASEFOLD) +Dir.glob(old_image_name, File::FNM_CASEFOLD)) and files.size >= 1
-                new_line = line.sub(m[2], new_image_name)
-                new_line = new_line.sub(m[3], '') if m[3]
-                puts "change_image_name_in_mediawiki #{__LINE__}  #{line} aus #{m[2]} mit #{new_image_name}" if $VERBOSE
-                newLines << new_line
+                newLines << fix_line(line, old_image_name, new_image_name)
               else
-                msg =  "#{__LINE__} Could not find image for #{m[0]} searched for #{simpleName} in #{Dir.pwd}. files are #{files}"
-                raise msg
+                newLines << fix_line(line)
               end
-            end
+          else
+            newLines << fix_line(line)
           end
         }
         File.open(mediawiki_file, "w") {|f| f.write newLines.join.gsub(/\[\[Datei:|\[\[Image:/i, '[[File:')}
         run_git_cmd("git add #{mediawiki_file}")
       ensure Dir.chdir(savedDir)
       end
+      def fix_line(line, old_file=nil, new_file=nil)
+        line.gsub!(/(<U\+\h\h\h\h>)/,'') # remove pseudo UTF-8
+        old_ref = 'unknown'
+        unless old_file
+          image_name = nil
+          if m = ImageWithSlashPattern.match(line)
+            old_file = m[2] + m[3]
+            old_ref = m[3].downcase
+          elsif m = ImagePattern.match(line)
+            old_file = m[2]
+            old_ref = m[2].downcase
+          end
+          return line unless m
+        end
+        new_file ||= Images.get_small_name(old_file)
+        proj = Images.get_project_abbreviation(Dir.pwd)
+        change_to = nil
+        if File.exists?(new_file)
+          change_to ||= new_file
+        else
+          [ old_ref,
+            old_file.sub(/^#{proj}[_]/i, proj+'-'),
+            new_file.sub(/^#{proj}/i, ''),
+            proj + '-' + new_file.sub(/^#{proj}/i, ''),
+            new_file.sub(/^#{proj}-#{proj}/i, proj + '-'),
+            new_file.sub(/^#{proj}-(.*)/i, proj + '\1'),
+            (proj + '-' + new_file).downcase,
+            ].each{
+              |try_this|
+              if File.exists?(try_this.downcase)
+                change_to ||= try_this.downcase
+                break
+              end
+            }
+        end
+        return line unless change_to
+        line.sub(old_file, change_to)
+      end
+
+      def cleanup_mediawikis
+        savedDir = Dir.pwd
+        @docs.each do
+          |docDir|
+          Dir.chdir(File.join(@rootDir, docDir))
+            wikis = Dir.glob('*.mediawiki')
+            wikis.each{
+              |file|
+              output = ''
+              lines = IO.readlines(file)
+              lines.each{|line| output << fix_line(line) }
+              File.open(file, 'w+') { |f| f.write(output) }
+            }
+        end
+        ensure
+          Dir.chdir(savedDir)
+      end
+
     end
   end
 end

data/lib/elexis/wiki/version.rb

@@ -1,5 +1,5 @@
 module Elexis
   module Wiki
-    VERSION = "0.5.2"
+    VERSION = "0.5.3"
   end
 end

data/spec/images_spec.rb

@@ -4,8 +4,9 @@ require 'spec_helper'
 require "elexis/wiki/images"
 
 describe 'Images' do
-  NR_PICTURES = 23
-  NR_ELEMS_IN_IMAGE_PATTERN = 4
+  NR_PICTURES = 24
+  NR_ELEMS_IN_IMAGE_PATTERN = 3
+  NR_ELEMS_IN_IMAGE_WITH_SLASH_PATTERN = 4
 
   before :all do
     @subdir = 'images'
@@ -21,6 +22,14 @@ describe 'Images' do
 #    FileUtils.rm_rf(@dataDir)
   end
 
+  it "should refuse to change the image name in a mediawiki file when we find no corresponding image file" do
+    wiki_file = File.join(@dataDir, @subdir, 'ch.elexis.icpc', 'doc', 'test2.mediawiki')
+    old_picture_name = 'ch.elexis.icpc:icpc4.png'
+    expect(IO.read(wiki_file)).to include old_picture_name
+    expect(File.exist?(wiki_file)).to eq true
+    expect { @images.change_image_name_in_mediawiki(wiki_file, old_picture_name, 'icpc_should_not_exist.png')}.to raise_error(RuntimeError, /Could not find image/)
+  end
+
   it "should create the pictures.yml and .csv file" do
     expect(@images.yml).to eq File.join(@images.rootDir, 'pictures.yml')
     expect(@images.csv).to eq File.join(@images.rootDir, 'pictures.csv')
@@ -42,15 +51,17 @@ describe 'Images' do
   end
 
   it "should match picture names with a /" do
-    res = Elexis::Wiki::ImagePattern.match('[[File:At.medevit.elexis.dbcheck/dbcleaningui.png|frame|none]]')
-    expect(res.size).to eq NR_ELEMS_IN_IMAGE_PATTERN
-    expect(res[2]).to eq 'dbcleaningui.png'
+    res = Elexis::Wiki::ImageWithSlashPattern.match('[[File:At.medevit.elexis.dbcheck/dbcleaningui.png|frame|none]]')
+    expect(res.size).to eq NR_ELEMS_IN_IMAGE_WITH_SLASH_PATTERN
+    expect(res[2]).to eq 'At.medevit.elexis.dbcheck/'
+    expect(res[3]).to eq 'dbcleaningui.png'
   end
 
   it "should match picture doc_de/settings_agenda-druck1.png" do
-    res = Elexis::Wiki::ImagePattern.match('[[File:doc_de/settings_agenda-druck1.png|image]]<br />')
-    expect(res.size).to eq NR_ELEMS_IN_IMAGE_PATTERN
-    expect(res[2]).to eq 'settings_agenda-druck1.png'
+    res = Elexis::Wiki::ImageWithSlashPattern.match('[[File:doc_de/settings_agenda-druck1.png|image]]<br />')
+    expect(res.size).to eq NR_ELEMS_IN_IMAGE_WITH_SLASH_PATTERN
+    expect(res[2]).to eq 'doc_de/'
+    expect(res[3]).to eq 'settings_agenda-druck1.png'
   end
 
   it "should match picture File:dbcleaningui.png" do
@@ -61,6 +72,7 @@ describe 'Images' do
 
   examples =  { 'doc_de/settings_agenda-druck1.png' => 'settings_agenda-druck1.png',
                 'doc_de/settingsAgendaDruck1.png'   => 'settings_agenda_druck1.png',
+                'Ch.elexis.privatrechnung/doc/privatrechnung-3.png' => 'privatrechnung-3.png',
                 'CurabillWarning1.png'              => 'curabill_warning1.png',
                 'ch.elexis.icpc/Icpc1.png'          => 'icpc-1.png',
                 }
@@ -79,7 +91,6 @@ describe 'Images' do
   end
 
   def check_rename(wiki_file, old_picture_name, new_picture_name, expected_new_line)
-    expect(IO.read(wiki_file)).to include old_picture_name
     @images.change_image_name_in_mediawiki(wiki_file, old_picture_name, new_picture_name)
     changed = IO.read(wiki_file)
     expect(changed).to include "tag_one"
@@ -100,6 +111,7 @@ describe 'Images' do
       'org.iatrix.tests/doc/test.png' => 'iatrix-test.png',
       'org.iatrix.tests/doc/test.jpg' => 'iatrix-test.jpg',
       'org.iatrix_tests/doc/test.gif' => 'iatrix-test.gif',
+      'ch.elexis.connect.abxmicros/doc/abxmicros-kabel.png' => 'abxmicros-kabel.png',
       }
     tests.each {
       |path, expected|
@@ -113,9 +125,10 @@ describe 'Images' do
   rename_tests = {
 #     'Ch.elexis.icpc:Icpc2.png' => [ 'icpc2.png', 'tag_two [[File:icpc-2.png|image]]'],
      'Ch.elexis.icpc:icpc5.png' => [ 'icpc5.png', 'tag_frame_none [[File:icpc5.png|frame|none]]'],
-     'Ch.elexis.icpc:icpc5.png' => [ 'icpc5.png', 'tag_png [[File:icpc5.png|image]]'],
-     'Ch.elexis.icpc:icpc6.png' => [ 'elexis_logo.jpg', 'tag_jpg [[File:elexis_logo.jpg|image]]'],
-     'Ch.elexis.icpc:icpc7.png' => [ 'disposan.gif', 'tag_gif [[File:disposan.gif|image]]'],
+     'ch.elexis.icpc:icpc5.png' => [ 'icpc5.png', 'tag_png [[File:icpc5.png|image]]<br />'],
+     'Ch.elexis.icpc:icpc6.png' => [ 'elexis_logo.jpg', 'tag_jpg [[File:icpc6.png|image]]'],
+     'Ch.elexis.icpc:icpc7.png' => [ 'disposan.gif', 'tag_gif [[File:icpc7.png|image]]'],
+     'Ch.elexis.icpc/favicon_green.png' => [ 'favicon_green.png', 'tag_slash [[File:favicon_green.png|image]]<br />'],
     }
   rename_tests.each {
               |old_picture_name, params|
@@ -136,14 +149,6 @@ describe 'Images' do
     expect(content).to include 'kabel.png]'
   end
 
-  it "should refuse to change the image name in a mediawiki file when we find no corresponding image file" do
-    wiki_file = File.join(@dataDir, @subdir, 'ch.elexis.icpc', 'doc', 'test2.mediawiki')
-    expect(File.exist?(wiki_file)).to eq true
-    old_picture_name = 'ch.elexis.icpc:icpc4.png'
-    expect(IO.read(wiki_file)).to include old_picture_name
-    expect { @images.change_image_name_in_mediawiki(wiki_file, old_picture_name, 'icpc_should_not_exist.png')}.to raise_error(RuntimeError, /Could not find image/)
-  end
-
   checks = {
     'at.medevit.elexis.swissmedic/fixmedikationaufruf.png'            => 'swissmedic',
     'at.medevit.elexis.swissmedic/doc/fixmedikationaufruf.png'        => 'swissmedic',
@@ -220,6 +225,23 @@ describe 'ImagesCleanup' do
       @images.execute_cleanup(true)
     end
 
+    it "should fix old names in" do
+      wiki_file = File.join(@dataDir, @subdir, 'ch.elexis.agenda', 'doc', 'agenda.mediawiki')
+      expect(File.exist?(wiki_file)).to eq true
+      @images.cleanup_mediawikis
+      content = IO.read(wiki_file)
+      expect(content).to include 'tag_one [[File:agenda-2.png|image]]<br />'
+      expect(content).to include 'tag_three [[File:agenda-2.png|image]]<br />'
+      expect(content).to include 'tag_two [[File:agenda-2.png|frame|none]]<br />'
+    end
+
+    it "should remove pseudo UTF-8 chars like <U+200E>" do
+      wiki_file =  File.join(@dataDir, @subdir, 'ch.elexis.icpc', 'doc', 'test2.mediawiki')
+      content = IO.read(wiki_file)
+      expect(File.exist?(wiki_file)).to eq true
+      expect(/(<U\+\h\h\h\h>)/.match(content)).to be nil
+    end
+
     it "should add icpc-8.png and icpc-1.png" do
       expect(@images.actions.index("git add -f images/ch.elexis.icpc/doc/icpc-1.png")).not_to eq nil
       expect(@images.actions.index("git add -f images/ch.elexis.icpc/doc/icpc1.png")).to eq nil
@@ -243,6 +265,7 @@ describe 'ImagesCleanup' do
     it 'should add a "-" if the image name starts with the abbrev' do
       expect(@images.actions.index("git add -f images/ch.elexis.icpc/doc/icpc-1.png")).not_to eq nil
     end
+
   end
 
   describe "execute_cleanup" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elexis-wiki-interface
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Niklaus Giger
@@ -166,6 +166,8 @@ files:
 - spec/data/doc/doc_de/.project
 - spec/data/images/ch.elexis.agenda/.project
 - spec/data/images/ch.elexis.agenda/META-INF/MANIFEST.MF
+- spec/data/images/ch.elexis.agenda/doc/agenda.mediawiki
+- spec/data/images/ch.elexis.agenda/doc/agenda2.png
 - spec/data/images/ch.elexis.agenda/doc/fixmedikationaufruf.png
 - spec/data/images/ch.elexis.agenda/plugin.properties
 - spec/data/images/ch.elexis.agenda/plugin.xml
@@ -283,6 +285,8 @@ test_files:
 - spec/data/doc/doc_de/.project
 - spec/data/images/ch.elexis.agenda/.project
 - spec/data/images/ch.elexis.agenda/META-INF/MANIFEST.MF
+- spec/data/images/ch.elexis.agenda/doc/agenda.mediawiki
+- spec/data/images/ch.elexis.agenda/doc/agenda2.png
 - spec/data/images/ch.elexis.agenda/doc/fixmedikationaufruf.png
 - spec/data/images/ch.elexis.agenda/plugin.properties
 - spec/data/images/ch.elexis.agenda/plugin.xml