elexis-wiki-interface 0.4 → 0.4.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZDI0NzM3ZTU2ZmVkZWI3NzBhMjAyZmI1ZjEwZjI0MGNkNTE0OTJlNg==
+  data.tar.gz: !binary |-
+    NTU1NzUzMmNiZGE4YjRiM2MxYzA3NTZkMjRmM2Y0ZDhhOTVhNzFjYg==
+SHA512:
+  metadata.gz: !binary |-
+    ZWZkNTk2OGE3NDM3MmQ0MDcwMzhjMDBiNjExMWY2OGM0NmVkMGIzYThjMjJi
+    MjZmNTQwYWMwMDBlMjFhNWY4ZTI1ZmI2N2Q0OTk4ZDQ4MDUzYjE3ZGQ2MWY1
+    MmUxYWEwNTYxNzI4MGVhZGQ5MDJlMzIxNzdkZTQ4YTVlOWQzNGY=
+  data.tar.gz: !binary |-
+    NTk5ZDI3OTZlODQyMWU1OGFkYjM2MjYyNmQ3MTdhNTJjZDFmNTg1ZjU0OWVj
+    ZmFkNjE1MzdmOWExZjc2ODg0M2MyMzE1YTU4ZTgyNTNjZDNiYzk1MDE4MjIz
+    ZDdlYTAxODZjM2JkYzc3NTljZDA3YzczYjcyMGJhNmZhZTQ2ZDk=

data/Gemfile

@@ -6,7 +6,7 @@ gemspec
 
 gem 'eclipse-plugin', :git => 'https://github.com/ngiger/eclipse-plugin'
 
-group :debuggerx do
+group :debugger do
 if /^2/.match(RUBY_VERSION)
   gem 'pry-byebug'
 else

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    elexis-wiki-interface (0.4)
+    elexis-wiki-interface (0.4.1)
       eclipse-plugin (>= 0.1)
       mediawiki-gateway
       rubyzip (< 1.0.0)
@@ -82,11 +82,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.5)
+  bundler (~> 1.10)
   eclipse-plugin!
   elexis-wiki-interface!
   pry-debugger
-  rake
+  rake (~> 10.0)
   rspec
   simplecov
 

data/History.txt

@@ -0,0 +1,8 @@
+=== 0.4.1 / 29.07.2015
+
+* Verify/correct path of all references images
+
+=== 0.4 / 29.07.2015
+
+* Fixed some problems when uploading images
+

data/README.textile

@@ -74,7 +74,7 @@ h3. Conventions
 ** a plugin plugin.name has a page plugin.name
 ** a view view.name with a localized name localized_name has a page <plugin.name>Views<localized_name>
 ** a perspective perspective.name with a localized name localized_name has a page  P_<localized_name>
-** png files should start with their plugin/feature-name followed by '_' by a unique name
+** png files should start with their plugin/feature-name followed by '/' by a name or a globally unique name
 ** png files resides inside the 'doc' sub-directory of each plugin/feature
 
 h3. Limitations/TODO

data/lib/elexis/wiki/interface/version.rb

@@ -1,7 +1,7 @@
 module Elexis
   module Wiki
     module Interface
-      VERSION = "0.4"
+      VERSION = "0.4.1"
     end
   end
 end

data/lib/elexis/wiki/interface/workspace.rb

@@ -10,6 +10,47 @@ require 'yaml'
 module Elexis
   module Wiki
     module Interface
+      ImagePrefix  = /Datei:|Image:/i
+      ImagePattern = /(\[Datei:|\[Image:)([\w\.\:]*)/i
+      def Interface.fix_image_locations(filename, id)
+        return unless File.exists?(filename)
+        lines = IO.readlines(filename)
+        dirName = File.dirname(filename)
+        newLines = []
+        lines.each{
+          |line|
+          unless m =ImagePattern.match(line)
+            newLines << line
+          else
+            simpleName = File.join(dirName, m[2])
+            if File.exists?(simpleName)
+              puts "Image simpleName #{simpleName} found" if $VERBOSE
+              newLines << line
+              next
+            else
+              underscoreName = File.join(dirName, m[2].sub(/[\:\/_]/, '/'))
+              if File.exists?(underscoreName)
+                puts "Image underscoreName #{underscoreName} found" if $VERBOSE
+                newLines << line.sub(ImagePattern, "#{m[1]}#{m[2].sub(/[\:\/_]/, '/')}")
+                next
+              else
+                shortName = File.join(dirName, m[2].sub(/#{id}[_:\/]/i, ''))
+                if File.exists?(shortName)
+                  puts "Image shortName #{shortName} found" if $VERBOSE
+                  newLines << line.sub(m[2], m[2].sub(/[_:]/i, '/'))
+                  next
+                else
+                  puts "Could not find image for #{m[0]}"
+                  newLines << line.sub(ImagePattern, "#{m[1]}#{m[2].sub(':', '_')}")
+                end
+              end
+            end
+          end
+
+        }
+        File.open(filename, "w+") {|f| f.puts newLines}
+      end
+
       class Workspace
         attr_reader :info, :mw, :wiki, :views_missing_documentation, :perspectives_missing_documentation, :plugins_missing_documentation, :features_missing_documentation,
             :doc_project, :features, :info
@@ -109,11 +150,13 @@ module Elexis
                                 begin
                                   res = @mw.upload(image, 'filename' => File.basename(image))
                                   puts "res für #{image}  exists? #{File.exists?(image)} ist #{res.to_s}"
-                                  puts "If you received API error: code 'verification-error', info 'This file did not pass file verification'"
-                                  puts "this means that the file type and content do not match, e.g. you have a *png file but in reality it is a JPEG file."
-                                  puts "In this case convert file.png file.png fixes this problem"
                                 rescue MediaWiki::APIError => e
                                   puts "rescue für #{image} #{e}" #  if $VERBOSE
+                                  if /verification-error/.match(e.to_s)
+                                    puts "If you received API error: code 'verification-error', info 'This file did not pass file verification'"
+                                    puts "this means that the file type and content do not match, e.g. you have a *png file but in reality it is a JPEG file."
+                                    puts "In this case convert file.png file.png fixes this problem"
+                                  end
                                 end
                 }
             end
@@ -148,6 +191,7 @@ module Elexis
           }
           @info.features.each{
             |id, info|
+              next unless /Com.actavis.medidirect/i.match(id)
               puts "Pulling for feature #{id}" if $VERBOSE
               pull_docs_features(info)
           }
@@ -172,6 +216,10 @@ module Elexis
           pageName
         end
 
+        def shorten_wiki_image(image)
+          File.basename(image.split(/[\:\/_]/)[-1])
+        end
+
         private
         def wiki_json_timestamp_to_time(json, page_or_img)
           return nil unless json
@@ -193,21 +241,17 @@ module Elexis
           puts "MediWiki #{@wiki} user #{@user} with password #{@password}" if $VERBOSE
         end
 
-        def shorten_wiki_image(image)
-          return File.basename(image) unless File.basename(image).index(':')
-          File.basename(image).split(':')[1..-1].join(':').gsub(':', '_')
-        end
-
         # http://wiki.elexis.info/api.php?action=query&format=json&list=allimages&ailimit=5&aiprop=timestamp&aiprefix=Ch.elexis.notes:config.png&*
         def get_image_modification_name(image)
-          json_url = "#{@wiki}?action=query&format=json&list=allimages&ailimit=5&aiprop=timestamp&aiprefix=#{shorten_wiki_image(image)}"
+          short_image = image.sub(ImagePrefix, '')
+          json_url = "#{@wiki}?action=query&format=json&list=allimages&ailimit=5&aiprop=timestamp&aiprefix=#{short_image}"
           json = RestClient.get(json_url)
           wiki_json_timestamp_to_time(json, image)
         end
 
         # helper function, as mediawiki-gateway does not handle this situation correctly
         def download_image_file(image, downloaded_image)
-          short_image = shorten_wiki_image(image)
+          short_image = image.sub(ImagePrefix, '')
           unless File.exist? downloaded_image
             json_url = "#{@wiki}?action=query&format=json&list=allimages&ailimit=5&aiprop=url&aiprefix=#{short_image}"
             json = RestClient.get(json_url)
@@ -232,7 +276,7 @@ module Elexis
                 puts "      error was #{e.inspect}"
             end
           end
-          puts "Downloaded image #{downloaded_image} #{File.size(downloaded_image)} bytes" if $VERBOSE
+          puts "Downloaded image #{downloaded_image} #{File.size(downloaded_image)} bytes" if $VERBOSE and File.exists?(downloaded_image)
         end
 
         def get_content_from_wiki(out_dir, pageName)
@@ -246,14 +290,15 @@ module Elexis
             return nil
           end
           if content
-            ausgabe = File.open(out_name, 'w+') { |f| f.write content.gsub(/(Image:[\w\.]+):(\w+.png)/, '\1_\2') }
+            ausgabe = File.open(out_name, 'w+') { |f| f.write content }
             @mw.images(pageName).each{
               |image|
                 image = image.gsub(/[^\w\.:]/, '_')
                 downloaded_image = File.join(out_dir, shorten_wiki_image(image))
-                download_image_file(image, downloaded_image.sub(':', ''))
-                break if defined?(RSpec) # speed up rspec
+                download_image_file(image, downloaded_image.sub(':', '_'))
+                break if defined?(RSpec) and not /icpc/i.match(pageName) # speed up RSpec
             }
+            Elexis::Wiki::Interface.fix_image_locations(out_name, pageName)
           else
             puts "Could not fetch #{pageName} from #{@mw}" if $VERBOSE
           end

data/spec/pull_spec.rb

@@ -56,8 +56,6 @@ describe 'Plugin' do
         wiki_files = Dir.glob(search)
         puts "We have the pulled the following wiki_files\n#{wiki_files.join("\n")}"
       end
-      name = File.join(@dataDir, "ch.elexis.core.application.feature", "doc", "Ch.elexis.core.application.feature.feature.group.mediawiki")
-      expect(Dir.glob(name).size).to eq 1
       name = File.join(@dataDir, "ch.elexis.core.application.feature", "Ch.elexis.core.application.feature.feature.group.mediawiki")
       expect(Dir.glob(name).size).to eq 0
       name = File.join(@dataDir, "ch.elexis.agenda", "doc", "Ch.elexis.agenda.mediawiki")
@@ -75,8 +73,6 @@ describe 'Plugin' do
       }
       expect(images.size).to be >= 1
       expect(workspace.features_missing_documentation.size).to eq 0
-      name = File.join(@dataDir, "ch.elexis.core.application.feature", "doc", "*mediawiki")
-      expect(Dir.glob(name).size).to eq 1
 
       name = File.join(@dataDir, "ch.elexis.icpc", "doc", "P_ICPC.mediawiki")
       expect(Dir.glob(name).size).to eq 1
@@ -85,10 +81,10 @@ describe 'Plugin' do
       name = File.join(@dataDir, "ch.elexis.icpc", "doc", "Ch.elexis.icpc.mediawiki")
       expect(Dir.glob(name).size).to eq 1
       content = IO.read(name)
-      m = /(Image:[\w\.]+):(\w+.png)/.match(content)
+      m = /(Image:[\w\.]+)[:_](\w+.png)/.match(content)
       expect(m).to be_nil
-      m = /(Image:[\w\.]+)_(\w+.png)/.match(content)
-      expect(m[0]).to eq 'Image:ch.elexis.icpc_icpc0.png'
+      m = /(Image:[\w\.]+)\/(\w+.png)/.match(content)
+      expect(m[0]).to eq 'Image:ch.elexis.icpc/icpc0.png'
   end
 
   it "should show all users" do

data/spec/push_spec.rb

@@ -12,10 +12,10 @@ describe 'Plugin' do
 
   before :each do
   end
-  
+
   it "should push a test page to the wiki.elexis.info" do
     fqdn = `hostname -f`
-    pending 'do not run push test on travis' if fqdn.match(/travis-ci.org/)
+    pending 'do not run push test on travis' if fqdn.match(/travis-ci.org/) or ENV['TRAVIS']
     hasConfig =  File.exists?('/etc/elexis-wiki-interface/config.yml') or File.exists?(File.join(Dir.pwd, 'config.yml'))
     pending 'no config file' unless hasConfig
     search = "#{@dataDir}/**/*.mediawiki"

data/spec/update_images_spec.rb

@@ -0,0 +1,50 @@
+#encoding : utf-8
+require 'spec_helper'
+
+require 'elexis/wiki/interface'
+require "elexis/wiki/interface/workspace"
+
+describe 'ImageHandling' do
+
+  before :all do
+    @originDir = File.expand_path(File.join(File.dirname(__FILE__), 'data', 'push', 'ch.elexis.icpc'))
+    @dataDir = File.expand_path(File.join(File.dirname(__FILE__), 'run', 'push'))
+    FileUtils.rm_rf(@dataDir)
+    FileUtils.makedirs(@dataDir)
+    FileUtils.cp_r(@originDir, @dataDir, :verbose => true, :preserve => true)
+  end
+
+  it "should shorten images files correctly" do
+    @dataDir =  File.expand_path(File.join(File.dirname(__FILE__), 'data', 'pull'))
+    workspace =  Elexis::Wiki::Interface::Workspace.new(@dataDir)
+    image = File.join(@dataDir, 'ch.elexis.icpc', 'doc', 'ch.elexis.ch/icpc1.png')
+    expect(workspace.shorten_wiki_image('/dummy/Ch.elexis.ch:icpc4.png')).to eq 'icpc4.png'
+    expect(workspace.shorten_wiki_image('/dummy/ch.elexis.ch:icpc3.png')).to eq 'icpc3.png'
+    expect(workspace.shorten_wiki_image('/dummy/ch.elexis.ch/icpc2.png')).to eq 'icpc2.png'
+    expect(workspace.shorten_wiki_image('/dummy/ch.elexis.ch_icpc1.png')).to eq 'icpc1.png'
+  end
+
+  it "should adapt correctly the image name" do
+    wiki_file = File.join(@dataDir, 'ch.elexis.icpc', 'doc', 'test.mediawiki')
+    puts wiki_file
+    expect(File.exists?(wiki_file)).to eq true
+    before =  ['tag_one [[Image:ch.elexis.icpc:icpc1.png|image]]',
+      'tag_two [[Image:ch.elexis.icpc:icpc2.png|image]]',
+      'tag_three [[Image:icpc3.png|image]]',
+      'tag_four [[Datei:ch.elexis.icpc:icpc4.png|image]]',
+      'tag_five [[Datei:Ch.elexis.icpc:icpc5.png|image]]',
+                ]
+    original = IO.read(wiki_file)
+    before.each{|string| expect(original).to include string }
+    Elexis::Wiki::Interface.fix_image_locations(wiki_file, 'ch.elexis.icpc')
+    after =  ['tag_one [[Image:ch.elexis.icpc/icpc1.png|image]]',
+      'tag_two [[Image:ch.elexis.icpc/icpc2.png|image]]',
+      'tag_three [[Image:icpc3.png|image]]',
+      'tag_four [[Datei:ch.elexis.icpc/icpc4.png|image]]',
+      'tag_five [[Datei:Ch.elexis.icpc/icpc5.png|image]]',
+                ]
+    changed = IO.read(wiki_file)
+    after.each{|string| expect(changed).to include string }
+  end
+end
+

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elexis-wiki-interface
 version: !ruby/object:Gem::Version
-  version: '0.4'
-  prerelease: 
+  version: 0.4.1
 platform: ruby
 authors:
 - Niklaus Giger
@@ -14,7 +13,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - <
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - <
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: unicode
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mediawiki-gateway
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: eclipse-plugin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -153,6 +136,7 @@ files:
 - .travis.yml
 - Gemfile
 - Gemfile.lock
+- History.txt
 - LICENSE
 - README.textile
 - Rakefile
@@ -186,40 +170,42 @@ files:
 - spec/data/pull/ch.elexis.notes/plugin_en.properties
 - spec/data/pull/ch.elexis.notes/plugin_fr.properties
 - spec/data/pull/doc_de/.project
-- spec/data/pull/doc_de/Doc_de_abrechnungssystem1.png
-- spec/data/pull/doc_de/doc_de.mediawiki
 - spec/data/push/ch.elexis.icpc/.project
 - spec/data/push/ch.elexis.icpc/META-INF/MANIFEST.MF
+- spec/data/push/ch.elexis.icpc/doc/ch.elexis.icpc_icpc1.png
 - spec/data/push/ch.elexis.icpc/doc/favicon_green.png
 - spec/data/push/ch.elexis.icpc/doc/test.mediawiki
 - spec/data/push/ch.elexis.icpc/plugin.xml
 - spec/pull_spec.rb
 - spec/push_spec.rb
+- spec/run/push/ch.elexis.icpc/doc/icpc3.png
+- spec/run/push/ch.elexis.icpc/doc/icpc4.png
+- spec/run/push/ch.elexis.icpc/doc/icpc5.png
 - spec/spec_helper.rb
+- spec/update_images_spec.rb
 homepage: http://wiki.elexis.info
 licenses:
 - GPLv3
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.4.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Interface between elexis source and wiki
 test_files:
 - spec/data/doc/doc_de/.project
@@ -245,14 +231,16 @@ test_files:
 - spec/data/pull/ch.elexis.notes/plugin_en.properties
 - spec/data/pull/ch.elexis.notes/plugin_fr.properties
 - spec/data/pull/doc_de/.project
-- spec/data/pull/doc_de/Doc_de_abrechnungssystem1.png
-- spec/data/pull/doc_de/doc_de.mediawiki
 - spec/data/push/ch.elexis.icpc/.project
 - spec/data/push/ch.elexis.icpc/META-INF/MANIFEST.MF
+- spec/data/push/ch.elexis.icpc/doc/ch.elexis.icpc_icpc1.png
 - spec/data/push/ch.elexis.icpc/doc/favicon_green.png
 - spec/data/push/ch.elexis.icpc/doc/test.mediawiki
 - spec/data/push/ch.elexis.icpc/plugin.xml
 - spec/pull_spec.rb
 - spec/push_spec.rb
+- spec/run/push/ch.elexis.icpc/doc/icpc3.png
+- spec/run/push/ch.elexis.icpc/doc/icpc4.png
+- spec/run/push/ch.elexis.icpc/doc/icpc5.png
 - spec/spec_helper.rb
-has_rdoc: 
+- spec/update_images_spec.rb