elexis-wiki-interface 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 291384c9cc7a771163d3852d2e385f453a07ef04
-  data.tar.gz: fb1ae9a6f28c11accef947fed4a0589cec24aa57
+  metadata.gz: 39023cc608821f4d521e4ecbc6bbced22b04bed5
+  data.tar.gz: 53d24e645de05ca3ebbb95d7ead6095de2ec9501
 SHA512:
-  metadata.gz: 4e2d1634af029853509980f403d3192ddb8bccedfaa6952dacf22318692b338826d14912b5f72474bc05236126e38c4beaa24d55d91dda12ee499d099bf1cf28
-  data.tar.gz: 1e0449c892a184e296ebb54ef91cfac61fb48136f35d31a1be985200a3206eb8100aadd9a19ba4a520cdb563555b2f343c5ddbddf288d12b3bb580f1a8f47c60
+  metadata.gz: 0dca8f432c28684fff8170c702b2efbbbea0a4bdec271b36eeeaf42116569f203c72715eb212cebce13c8738495bd97d2d998f84ca8be12ffdc0924bbc940280
+  data.tar.gz: 42a2159ea7d141b3b4e72c6bceb4a6c552a415f21ad2a7b3d24bced1c35c5423212ff40182ec11c5072e1275c86edb26ddc2033ed10537503c0087691ed4ffd2

data/Gemfile.lock

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

data/history.textile

@@ -1,3 +1,13 @@
+h3. Version 0.5.2 (2015-10-29)
+
+* Correctly rename picture with ':' and '/'.
+* Convert CamelCase to underscore
+
+h3. Version 0.5.1 (2015-10-24)
+
+* Ensure that files that start with the short project name are followed by a '-'
+* Accept picture containing '-' in their base_name
+
 h3. Version 0.5.1 (2015-10-23)
 
 * Cleanup doc

data/lib/elexis/wiki/images.rb

@@ -10,9 +10,19 @@ require 'time'
 require 'yaml'
 require 'csv'
 
+class String
+  # Convert CamelCase to underscore
+  def underscore
+    self.gsub(/::/, '/').
+    gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+    gsub(/([a-z\d])([A-Z])/,'\1_\2').
+    downcase
+  end
+end
+
 module Elexis
   module Wiki
-    ImagePattern = /(\[File:|Datei:|\[Image:)([ \w\.\:\/]*)/i
+    ImagePattern = /(\[File:|Datei:|\[Image:)(?:[^\/:]*\/)?([ \w\.:\/-]*)([^\]\|]*)/
 
     #
     # This helper class collect information about all images used in
@@ -109,13 +119,13 @@ module Elexis
           sha256 = Digest::SHA256.hexdigest(IO.read(path))
           same_sha256 = @pictures.find_all{|x| x[:sha256] == sha256}
           same_name   = @pictures.find_all{|x| x[:name] == picture[:name]}
-          nrSha256 = same_name.collect{|c| get_small_name(c[:sha256])}.uniq
+          nrSha256 = same_name.collect{|c| Images.get_small_name(c[:sha256])}.uniq
           if same_sha256.size == 1 and nrSha256.size == 1
             puts "new_best_name 3 @short_and_sha_okay #{sha256} for #{path}" if debug
             picture[:rule] = 'short_and_sha_okay nr_single_sha'
             @short_and_sha_okay << path
             @nr_single_sha << same_sha256
-            picture[:best_name] = get_small_name(path)
+            picture[:best_name] = Images.get_small_name(path)
             return
           else
             msg = " nrSha #{sha256.size} #{sha256}"
@@ -129,16 +139,16 @@ module Elexis
             if found.size == 1  and nrSha256.size == 1
               puts "new_best_name 4 case_sensitives #{found}" if debug
               picture[:rule] = 'case_sensitives'
-              picture[:best_name] = get_small_name(path)
+              picture[:best_name] = Images.get_small_name(path)
               return
             end
             multiple = same_sha256.collect{|c| c[:name]}.uniq
-            to_reduce = same_sha256.collect{|c| get_small_name(c[:name])}.uniq
+            to_reduce = same_sha256.collect{|c| Images.get_small_name(c[:name])}.uniq
             if nrSha256.size == 1
               @to_short_names[path] = to_reduce
               puts "new_best_name 5 to_short_names #{multiple} =>  #{to_reduce} nrSha #{sha256.size} #{sha256}" if debug
               picture[:rule] = 'to_short_names'
-              picture[:best_name] = get_small_name(path)
+              picture[:best_name] = Images.get_small_name(path)
               return
             end
             puts "new_best_name  6 multiple #{multiple} to_reduce #{to_reduce} #{get_name_with_project(picture[:path])}" if debug
@@ -171,16 +181,22 @@ module Elexis
         initialize_database
       end
 
-      def get_name_with_project(path)
+      def Images.get_project_abbreviation(path)
         dir = File.dirname(path)
+        dir.sub!(/\/images$/, '')
         found = dir.sub(/(\.feature|[._]test.*|)\/doc/i, '').sub(/\.v\d$/, '')
-        result = (found.split('.')[-1] + '-' + File.basename(path)).downcase.gsub(':', '-')
+        found.split('.')[-1]
+      end
+
+      def get_name_with_project(path)
+        prefix =Images.get_project_abbreviation(path)
+        result = (prefix + '-' + File.basename(path)).downcase.gsub(':', '-')
         result
       end
 
-      def get_small_name(path)
+      def Images.get_small_name(path)
         ext =  File.extname(path)
-        to_consider = File.basename(path, ext).gsub(':','-')
+        to_consider = File.basename(path, ext).gsub(':','-').underscore
         if to_consider.index('.')
           part = to_consider.split('.')[-1].downcase
           if  part.split('_').size > 1
@@ -191,6 +207,10 @@ module Elexis
         else
           result = to_consider
         end
+        short = Images.get_project_abbreviation(path)
+        regexp = /^(#{short})([^-])/i
+        m = regexp.match(result)
+        result = result.sub(regexp, '\1-\2') if m and short
         (result + ext).downcase
       end
 
@@ -229,26 +249,12 @@ module Elexis
         end
       end
 
-      def remove_files_with_case_sensitive_changes(file_correct_case)
-        files = Dir.glob(file_correct_case + '*', File::FNM_CASEFOLD)
-        return if files.size == 1
-        files.each{
-          |file|
-            next if File.basename(file).eql?(File.basename(file_correct_case))
-            if @add_changes_to_git
-              run_git_cmd("git rm -f #{file}")
-            else
-              FileUtils.rm_f(file)
-            end
-        }
-      end
-
-      def run_git_cmd(git_cmd)
+      def run_git_cmd(git_cmd, may_fail=false)
         return unless @add_changes_to_git
         res = system(git_cmd)
         unless res
           raise "Running #{git_cmd} failed"
-        end
+        end unless may_fail
         @actions  << git_cmd
       end
 
@@ -266,7 +272,7 @@ module Elexis
           Dir.glob("*#{extension}").each  do
             |wiki_file|
           old_image_name = picture[:name]
-          new_image_name = picture[:best_name]
+          new_image_name = picture[:best_name].downcase
           if old_image_name.index('-')
             puts "Skipping mv #{old_image_name} #{new_image_name}"
             next
@@ -286,9 +292,20 @@ module Elexis
                        }
         end
         }
+
+        # change_image_name_in_mediawiki
         Dir.chdir(@rootDir)
         # Add all pictures which were downloaded and still have the same name
-        @pictures.each { |picture| run_git_cmd("git add -f #{picture[:path]}") if File.exist?(picture[:path]) }
+        @pictures.each { |picture|
+                          next unless picture[:best_name]
+                          dir = File.dirname(picture[:path])
+                          dir ||= '.'
+                          new_path = File.join(dir, picture[:best_name])
+                          next unless File.exists?(picture[:path])
+                          FileUtils.cp(picture[:path], new_path, :verbose => true)  unless File.exists?(new_path)
+                          run_git_cmd("git add -f #{new_path}")
+                          run_git_cmd("git rm -f --ignore-unmatch #{picture[:path]}", true) if picture[:path] != new_path
+                         }
         @actions.uniq!
         puts @actions.join("\n")
       ensure
@@ -299,6 +316,8 @@ module Elexis
       # We assume that the referenced new_image_name is living in the same directory
       # as the mediawiki_file
       def change_image_name_in_mediawiki(mediawiki_file, old_image_name, new_image_name)
+        savedDir = Dir.pwd
+        Dir.chdir(File.dirname(mediawiki_file))
         if new_image_name.downcase != File.basename(new_image_name).downcase
           raise "new_image_name #{new_image_name} may not contain a directory path"
         end
@@ -325,6 +344,7 @@ module Elexis
               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
               else
@@ -336,6 +356,7 @@ module Elexis
         }
         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
     end
   end

data/lib/elexis/wiki/interface.rb

@@ -157,6 +157,7 @@ module Elexis
             end
             rescue => e
               puts "JSON: Could not fetch for image #{image} for #{pageName} using #{json_url}"
+              FileUtils.rm_f(image) if File.exists?(image) and File.size(image) == 0
               puts "      was '#{json}'"
               puts "      error was #{e.inspect}"
           end

data/lib/elexis/wiki/version.rb

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

data/spec/data/images/ch.elexis.icpc/doc/test2.mediawiki

@@ -11,7 +11,8 @@ tag_four [[Datei:ch.elexis.icpc:icpc4.png|image]]<br />
 tag_png [[Datei:Ch.elexis.icpc:icpc5.png|image]]<br />
 tag_jpg [[Datei:Ch.elexis.icpc:icpc6.png|image]]<br />
 tag_gif [[Datei:Ch.elexis.icpc:icpc7.png|image]]<br />
-tag_utf [[File:curabillsettings.png<U+200E>]]
+tag_utf [[File:kabel.png<U+200E>]]
+tag_frame_none [[File:Ch.elexis.icpc:icpc5.png|frame|none]] <br>
 
 
 

data/spec/images_spec.rb

@@ -4,7 +4,8 @@ require 'spec_helper'
 require "elexis/wiki/images"
 
 describe 'Images' do
-  NR_PICTURES = 22
+  NR_PICTURES = 23
+  NR_ELEMS_IN_IMAGE_PATTERN = 4
 
   before :all do
     @subdir = 'images'
@@ -40,6 +41,37 @@ describe 'Images' do
     expect(content.index('favicon_green.png')).not_to eq 0
   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'
+  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'
+  end
+
+  it "should match picture File:dbcleaningui.png" do
+    res = Elexis::Wiki::ImagePattern.match('[[File:dbcleaningui.png|frame|none]]')
+    expect(res.size).to eq NR_ELEMS_IN_IMAGE_PATTERN
+    expect(res[2]).to eq 'dbcleaningui.png'
+  end
+
+  examples =  { 'doc_de/settings_agenda-druck1.png' => 'settings_agenda-druck1.png',
+                'doc_de/settingsAgendaDruck1.png'   => 'settings_agenda_druck1.png',
+                'CurabillWarning1.png'              => 'curabill_warning1.png',
+                'ch.elexis.icpc/Icpc1.png'          => 'icpc-1.png',
+                }
+  examples.each{
+    |picture_name, expected_result|
+      it "should return correct get_small_name for #{picture_name}" do
+        res = Elexis::Wiki::Images.get_small_name picture_name
+        expect(res).to eq expected_result
+      end
+  }
+
   it "pictures.csv should contain some png" do
     content = IO.read(@images.csv)
     expect(content.index('icpc6.png')).not_to eq 0
@@ -79,6 +111,8 @@ describe 'Images' do
   end
 
   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]]'],
@@ -91,6 +125,17 @@ describe 'Images' do
     end
   }
 
+  it "should remove UTF-8 chars like <U+200E> after picture names" do
+    wiki_file = File.join(@dataDir, @subdir, 'ch.elexis.icpc', 'doc', 'test2.mediawiki')
+    expect(File.exist?(wiki_file)).to eq true
+    old_picture_name = 'kabel.png'
+    new_picture_name =  Elexis::Wiki::Images.get_small_name(old_picture_name)
+    expect(IO.read(wiki_file)).to include old_picture_name
+    @images.change_image_name_in_mediawiki(wiki_file, old_picture_name, new_picture_name)
+    content = IO.read(wiki_file)
+    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
@@ -99,6 +144,17 @@ describe 'Images' do
     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',
+    'at.medevit.elexis.swissmedic/doc/images/fixmedikationaufruf.png' => 'swissmedic',
+              }
+  checks.each{
+    |path, expected|
+    it "should return correct project name  #{expected} for #{path}" do
+      expect(Elexis::Wiki::Images.get_project_abbreviation(path)).to eq expected
+    end
+  }
   describe "determine_cleanup" do
     before(:all) do
       @images.determine_cleanup
@@ -164,9 +220,28 @@ describe 'ImagesCleanup' do
       @images.execute_cleanup(true)
     end
 
-    it "should add Icpc8.png and icpc1.png" do
-      expect(@images.actions.index("git add -f images/ch.elexis.icpc/doc/icpc1.png")).not_to eq nil
-      expect(@images.actions.index("git add -f images/ch.elexis.icpc/doc/Icpc8.png")).not_to eq nil
+    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
+      expect(@images.actions.index("git add -f images/ch.elexis.icpc/doc/Icpc1.png")).to eq nil
+      expect(@images.actions.index("git add Icpc8.png && git mv Icpc8.png icpc-8.png")).not_to eq nil
+      expect(@images.actions.index("git add -f images/ch.elexis.icpc/doc/icpc8.png")).to eq nil
+      expect(@images.actions.index("git add -f images/ch.elexis.icpc/doc/Icpc8.png")).to eq nil
+    end
+
+    it 'should not contain an picture with uppercase letter' do
+      regexp = /git add -f images\/(?:[.\w]+\/)+(?:[a-z0-9]*)([A-Z])/
+      @images.actions.each{
+        |img|
+          if m = regexp.match(img)
+            puts "Found uppercase in #{img}"
+            expect(m).to eq nil
+      end
+      }
+    end
+
+    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
 
@@ -217,20 +292,6 @@ describe 'ImagesCleanup' do
       files = Dir.glob(search)
       expect(files.size).to eq 0
     end
-    it "should remove_files_with_case_sensitive_changes" do
-      lowercase = "#{@images.rootDir}/test_lower_case.png"
-      up_case = "#{@images.rootDir}/TEST_LOWER_CASE.png"
-      capitalized = "#{@images.rootDir}/Test_lower_case.png"
-      [ lowercase, up_case, capitalized].each {
-        |file|
-          system("touch #{file}")
-          expect(File.exist?(file))
-      }
-      @images.remove_files_with_case_sensitive_changes(lowercase)
-      expect(File.exist?(lowercase))
-      expect(File.exist?(up_case)).to eq false
-      expect(File.exist?(capitalized)).to eq false
-    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elexis-wiki-interface
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-24 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -371,4 +371,3 @@ test_files:
 - spec/interface_spec.rb
 - spec/pull_spec.rb
 - spec/spec_helper.rb
-has_rdoc: