elexis-wiki-interface 0.4.8 → 0.5.0

data/spec/interface_spec.rb

@@ -0,0 +1,118 @@
+#encoding : utf-8
+require 'spec_helper'
+
+require "elexis/wiki/interface"
+
+describe 'Wiki_Interface' do
+  match_upload_result = /Success|Warning/i
+
+  before(:all) do
+    skip 'does not work under travis-ci' if ENV['TRAVIS']
+    @if = Elexis::Wiki::Interface.new
+    puts @if.wiki_url
+    # expect(@if.wiki_url).to match /localhost/i # we don't want to test with a real wiki
+    @test_image = "elexis_api_test.png"
+    @test_image_file = File.join(File.join(File.dirname(__FILE__), 'data', 'push', 'elexis_api_test.png'))
+    expect(File.exists?(@test_image_file))
+    res = @if.upload_image(@test_image, @test_image_file, 'TestKommentar Niklaus', nil)
+    expect(res)
+    expect(res.data['result']).to match match_upload_result
+  end
+
+  it "should be possible to if.upload an @test_image_file to path without ':' nor '/'" do
+    expect(File.exists?(@test_image_file))
+    skip "Niklaus does not know why we get sometimes an internal error and sometimes not"
+    res = @if.upload("api_test2.png", @test_image_file, 'TestKommentar Niklaus')
+    expect(res.class).to eq MediawikiApi::Response
+    expect(res.data['result']).to match match_upload_result
+    expect(res.data['warnings']['badfilename']).to eq nil
+    expect(res.data['warnings']['duplicate']).to_not eq nil # we already if.uploaded via before(:all)
+  end
+
+  it "should be possible to if.upload an @test_image_file to a path with ':'" do
+    expect(File.exists?(@test_image_file))
+    res = @if.upload("api_test:api_test2.png", @test_image_file, 'TestKommentar Niklaus')
+    expect(res.class).to eq MediawikiApi::Response
+    expect(res.data['result']).to match match_upload_result
+    expect(res.data['warnings']['badfilename']).to eq 'Api_test-api_test2.png'
+    expect(res.data['warnings']['duplicate']).to_not eq nil # we already if.uploaded via before(:all)
+  end
+
+  it "should be possible to if.upload an @test_image_file to a path with '/'" do
+    expect(File.exists?(@test_image_file))
+#        def upload_image(filename, path, comment='', options = "ignorewarnings")
+    res = @if.upload("api_test/api_test2.png", @test_image_file, 'TestKommentar Niklaus')
+    expect(res.class).to eq MediawikiApi::Response
+    expect(res.data['result']).to match match_upload_result
+    expect(res.data['warnings']['badfilename']).to eq 'Api_test2.png'
+    expect(res.data['warnings']['duplicate']).to_not eq nil # we already if.uploaded via before(:all)
+  end
+
+  it "should return all images for icpc" do
+    res = @if.images('Ch.elexis.icpc')
+    expect(res.size).not_to eq 0
+  end
+
+  it "should return all images for icpc" do
+    res = @if.images('At.medevit.medelexis.text.msword')
+    expect(res.size).not_to eq 0
+    res.each{|page| expect(page.index(' ')).to eq nil }
+  end
+
+  it "should be able to create, edit and delete a page" do
+    test_page = 'api_test_page'
+    first_content = 'Some dummy content. First try'
+    second_content = 'Some dummy content. second try'
+    res = @if.create(test_page, first_content, { :comment => 'dummy comment'})
+    expect(res.status).to eq 200
+    expect(res.data['result']).to match match_upload_result
+
+    inhalt = @if.get(test_page)
+    expect(inhalt).to eq first_content
+    res = @if.edit(test_page, second_content)
+    expect(res.status).to eq 200
+    expect(res.data['result']).to match match_upload_result
+    inhalt = @if.get(test_page)
+    expect(inhalt).to eq second_content
+    res = @if.delete(test_page)
+    expect(res.status).to eq 200
+    inhalt = @if.get(test_page)
+    expect(inhalt).to be_nil
+  end
+
+  it "should return mediawiki_text for icpc" do
+    res = @if.get('Ch.elexis.icpc')
+    expect(res.index('== Einführung ==')).not_to eq 0
+    expect(res.index('ICPC-2, die *I*nternational *')).not_to eq 0
+  end
+
+  it "should download an image" do
+    image = 'Elexis3.0_inst_1.jpg'
+    destination = File.join(Dir::tmpdir, 'tst_picture.png')
+    FileUtils.rm_f(destination, :verbose => false)
+    res = @if.download_image_file(image, destination, 'ch.elexis.icpc')
+    expect(res).to eq nil
+    expect(File.exists?(destination)).to eq true
+    expect(File.size(destination)).not_to eq 0
+    FileUtils.rm_f(destination, :verbose => false)
+  end
+
+
+  it "should show all users" do
+    wiki_users = @if.users
+    puts "We have #{wiki_users.size} wiki users"
+    expect wiki_users.size <= 50
+    contribs = @if.contributions(wiki_users.first)
+  end
+
+  it "should download an image without a pagename" do
+    dest = 'tst.png'
+    FileUtils.rm_f(dest, :verbose => false)
+    name = 'Swelab-kabel.png'
+    res = @if.download_image_file(name, dest)
+    expect(res).to eq nil
+    expect(File.exist?(dest))
+    res = @if.download_image_file(name)
+    expect(File.size(dest)).to eq res.size
+  end
+end

data/spec/pull_spec.rb

@@ -1,8 +1,7 @@
 #encoding : utf-8
 require 'spec_helper'
 
-require 'elexis/wiki/interface'
-require "elexis/wiki/interface/workspace"
+require "elexis/wiki/workspace"
 describe 'Plugin' do
 
   def remove_all_mediawiki
@@ -12,7 +11,8 @@ describe 'Plugin' do
   end
   before :all do
     @dataDir =  File.expand_path(File.join(File.dirname(__FILE__), 'data', 'pull'))
-    @workspace =  Elexis::Wiki::Interface::Workspace.new(@dataDir)
+    skip 'does not work under travis-ci' if ENV['TRAVIS']
+    @workspace =  Elexis::Wiki::Workspace.new(@dataDir)
     @workspace.pull
   end
 
@@ -87,8 +87,8 @@ describe 'Plugin' do
   end
 
   it "should show all users" do
-    @workspace =  Elexis::Wiki::Interface::Workspace.new(@dataDir)
-    puts "We have #{@workspace.mw.users.size} wiki users"
+    @workspace =  Elexis::Wiki::Workspace.new(@dataDir)
+    puts "We have #{@workspace.if.users.size} wiki users"
   end unless ENV['TRAVIS']
 
   it "should check the matrix" do
@@ -101,4 +101,15 @@ describe 'Plugin' do
     expect($ws_errors.size).to eq 1
   end
 
+  it "should not create any file containing Datei: in their name" do
+    search = "#{@workspace.ws_dir}/**/*Datei:*"
+    files = Dir.glob(search)
+    expect(files.size).to eq 0
+  end
+
+  it "should find any files with ':' in their names" do
+    search = "#{@workspace.ws_dir}/**/*:*"
+    files = Dir.glob(search)
+    expect(files.size).to eq 0
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elexis-wiki-interface
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.5.0
 platform: ruby
 authors:
 - Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-15 00:00:00.000000000 Z
+date: 2015-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mediawiki_api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: eclipse-plugin
   requirement: !ruby/object:Gem::Requirement
@@ -127,7 +141,7 @@ email:
 - niklaus.giger@member.fsf.org
 executables:
 - wiki_pull
-- wiki_pull_daily
+- wiki_pull_and_commit
 - wiki_push
 extensions: []
 extra_rdoc_files: []
@@ -136,19 +150,70 @@ files:
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
-- History.txt
 - LICENSE
 - README.textile
 - Rakefile
 - bin/wiki_pull
-- bin/wiki_pull_daily
+- bin/wiki_pull_and_commit
 - bin/wiki_push
 - elexis-wiki-interface.gemspec
+- history.textile
+- lib/elexis/wiki/images.rb
 - lib/elexis/wiki/interface.rb
-- lib/elexis/wiki/interface/version.rb
-- lib/elexis/wiki/interface/workspace.rb
+- lib/elexis/wiki/version.rb
+- lib/elexis/wiki/workspace.rb
 - spec/data/.gitignore
 - 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/fixmedikationaufruf.png
+- spec/data/images/ch.elexis.agenda/plugin.properties
+- spec/data/images/ch.elexis.agenda/plugin.xml
+- spec/data/images/ch.elexis.agenda/plugin_de.properties
+- spec/data/images/ch.elexis.agenda/plugin_en.properties
+- spec/data/images/ch.elexis.agenda/plugin_fr.properties
+- spec/data/images/ch.elexis.core.application.feature/.project
+- spec/data/images/ch.elexis.core.application.feature/build.properties
+- spec/data/images/ch.elexis.core.application.feature/feature.xml
+- spec/data/images/ch.elexis.core.application.feature/pom.xml
+- spec/data/images/ch.elexis.icpc/.project
+- spec/data/images/ch.elexis.icpc/META-INF/MANIFEST.MF
+- spec/data/images/ch.elexis.icpc/doc/Com.hilotec.elexis.opendocument_anleitung_opendocument_1.png
+- spec/data/images/ch.elexis.icpc/doc/FixmedikationAufruf.png
+- spec/data/images/ch.elexis.icpc/doc/Icpc8.png
+- spec/data/images/ch.elexis.icpc/doc/ch.elexis.icpc_icpc1.png
+- spec/data/images/ch.elexis.icpc/doc/disposan.gif
+- spec/data/images/ch.elexis.icpc/doc/elexis_logo.jpg
+- spec/data/images/ch.elexis.icpc/doc/favicon_green.png
+- spec/data/images/ch.elexis.icpc/doc/icpc0.png
+- spec/data/images/ch.elexis.icpc/doc/icpc1.png
+- spec/data/images/ch.elexis.icpc/doc/icpc2.png
+- spec/data/images/ch.elexis.icpc/doc/icpc3.png
+- spec/data/images/ch.elexis.icpc/doc/icpc4.png
+- spec/data/images/ch.elexis.icpc/doc/icpc5.png
+- spec/data/images/ch.elexis.icpc/doc/icpc6.png
+- spec/data/images/ch.elexis.icpc/doc/icpc7.png
+- spec/data/images/ch.elexis.icpc/doc/icpc9.png
+- spec/data/images/ch.elexis.icpc/doc/kabel.png
+- spec/data/images/ch.elexis.icpc/doc/medevit_inbox1.png
+- spec/data/images/ch.elexis.icpc/doc/test.mediawiki
+- spec/data/images/ch.elexis.icpc/doc/test2.mediawiki
+- spec/data/images/ch.elexis.icpc/plugin.xml
+- spec/data/images/ch.elexis.notes/.project
+- spec/data/images/ch.elexis.notes/META-INF/MANIFEST.MF
+- spec/data/images/ch.elexis.notes/doc/At.medevit.medelexis.text.msword:WordBriefe.png
+- spec/data/images/ch.elexis.notes/doc/Ch.medelexis.openoffice:TextverarbeitungSettings.png
+- spec/data/images/ch.elexis.notes/doc/Icpc1.png
+- spec/data/images/ch.elexis.notes/doc/kabel.png
+- spec/data/images/ch.elexis.notes/doc/medidirect:use2.png
+- spec/data/images/ch.elexis.notes/doc/test.mediawiki
+- spec/data/images/ch.elexis.notes/plugin.properties
+- spec/data/images/ch.elexis.notes/plugin.xml
+- spec/data/images/ch.elexis.notes/plugin_de.properties
+- spec/data/images/ch.elexis.notes/plugin_en.properties
+- spec/data/images/ch.elexis.notes/plugin_fr.properties
+- spec/data/images/doc_de/.project
+- spec/data/images/elexis_api_test.png
 - spec/data/pull/ch.elexis.agenda/.project
 - spec/data/pull/ch.elexis.agenda/META-INF/MANIFEST.MF
 - spec/data/pull/ch.elexis.agenda/plugin.properties
@@ -184,11 +249,11 @@ files:
 - spec/data/push/ch.elexis.icpc/doc/icpc5.png
 - spec/data/push/ch.elexis.icpc/doc/test.mediawiki
 - spec/data/push/ch.elexis.icpc/plugin.xml
+- spec/data/push/elexis_api_test.png
+- spec/images_spec.rb
+- spec/interface_spec.rb
 - spec/pull_spec.rb
-- spec/push_spec.rb
 - spec/spec_helper.rb
-- spec/update_images_spec.rb
-- spec/user_spec.rb
 homepage: http://wiki.elexis.info
 licenses:
 - GPLv3
@@ -216,6 +281,56 @@ summary: Interface between elexis source and wiki
 test_files:
 - spec/data/.gitignore
 - 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/fixmedikationaufruf.png
+- spec/data/images/ch.elexis.agenda/plugin.properties
+- spec/data/images/ch.elexis.agenda/plugin.xml
+- spec/data/images/ch.elexis.agenda/plugin_de.properties
+- spec/data/images/ch.elexis.agenda/plugin_en.properties
+- spec/data/images/ch.elexis.agenda/plugin_fr.properties
+- spec/data/images/ch.elexis.core.application.feature/.project
+- spec/data/images/ch.elexis.core.application.feature/build.properties
+- spec/data/images/ch.elexis.core.application.feature/feature.xml
+- spec/data/images/ch.elexis.core.application.feature/pom.xml
+- spec/data/images/ch.elexis.icpc/.project
+- spec/data/images/ch.elexis.icpc/META-INF/MANIFEST.MF
+- spec/data/images/ch.elexis.icpc/doc/Com.hilotec.elexis.opendocument_anleitung_opendocument_1.png
+- spec/data/images/ch.elexis.icpc/doc/FixmedikationAufruf.png
+- spec/data/images/ch.elexis.icpc/doc/Icpc8.png
+- spec/data/images/ch.elexis.icpc/doc/ch.elexis.icpc_icpc1.png
+- spec/data/images/ch.elexis.icpc/doc/disposan.gif
+- spec/data/images/ch.elexis.icpc/doc/elexis_logo.jpg
+- spec/data/images/ch.elexis.icpc/doc/favicon_green.png
+- spec/data/images/ch.elexis.icpc/doc/icpc0.png
+- spec/data/images/ch.elexis.icpc/doc/icpc1.png
+- spec/data/images/ch.elexis.icpc/doc/icpc2.png
+- spec/data/images/ch.elexis.icpc/doc/icpc3.png
+- spec/data/images/ch.elexis.icpc/doc/icpc4.png
+- spec/data/images/ch.elexis.icpc/doc/icpc5.png
+- spec/data/images/ch.elexis.icpc/doc/icpc6.png
+- spec/data/images/ch.elexis.icpc/doc/icpc7.png
+- spec/data/images/ch.elexis.icpc/doc/icpc9.png
+- spec/data/images/ch.elexis.icpc/doc/kabel.png
+- spec/data/images/ch.elexis.icpc/doc/medevit_inbox1.png
+- spec/data/images/ch.elexis.icpc/doc/test.mediawiki
+- spec/data/images/ch.elexis.icpc/doc/test2.mediawiki
+- spec/data/images/ch.elexis.icpc/plugin.xml
+- spec/data/images/ch.elexis.notes/.project
+- spec/data/images/ch.elexis.notes/META-INF/MANIFEST.MF
+- spec/data/images/ch.elexis.notes/doc/At.medevit.medelexis.text.msword:WordBriefe.png
+- spec/data/images/ch.elexis.notes/doc/Ch.medelexis.openoffice:TextverarbeitungSettings.png
+- spec/data/images/ch.elexis.notes/doc/Icpc1.png
+- spec/data/images/ch.elexis.notes/doc/kabel.png
+- spec/data/images/ch.elexis.notes/doc/medidirect:use2.png
+- spec/data/images/ch.elexis.notes/doc/test.mediawiki
+- spec/data/images/ch.elexis.notes/plugin.properties
+- spec/data/images/ch.elexis.notes/plugin.xml
+- spec/data/images/ch.elexis.notes/plugin_de.properties
+- spec/data/images/ch.elexis.notes/plugin_en.properties
+- spec/data/images/ch.elexis.notes/plugin_fr.properties
+- spec/data/images/doc_de/.project
+- spec/data/images/elexis_api_test.png
 - spec/data/pull/ch.elexis.agenda/.project
 - spec/data/pull/ch.elexis.agenda/META-INF/MANIFEST.MF
 - spec/data/pull/ch.elexis.agenda/plugin.properties
@@ -251,8 +366,8 @@ test_files:
 - spec/data/push/ch.elexis.icpc/doc/icpc5.png
 - spec/data/push/ch.elexis.icpc/doc/test.mediawiki
 - spec/data/push/ch.elexis.icpc/plugin.xml
+- spec/data/push/elexis_api_test.png
+- spec/images_spec.rb
+- spec/interface_spec.rb
 - spec/pull_spec.rb
-- spec/push_spec.rb
 - spec/spec_helper.rb
-- spec/update_images_spec.rb
-- spec/user_spec.rb

data/History.txt

@@ -1,41 +0,0 @@
-=== 0.4.8 / 15.08.2015
-
-* Push doc_de and doc_fr, too
-
-=== 0.4.7 / 15.08.2015
-
-* Push features, too
-
-=== 0.4.6 / 15.08.2015
-
-* Replace [[Datei:|[[Image: by [[File:
-* Cleanup readme.textile
-* Avoid adding an EOL at the end of the file
-
-=== 0.4.5 / 14.08.2015
-
-* Don't report plugin without documenteation, as only features are required to have one
-
-=== 0.4.4 / 14.08.2015
-
-* Check whether all features have an entry in the Matrix_3.0 page
-* Create logical link inside a doc directory. This allows the mylyn preview to work
-* Allow images without a directory in their name.
-
-=== 0.4.3 / 07.08.2015
-
-* Use gem eclipse-plugin from rubygem not github
-
-=== 0.4.2 / 29.07.2015
-
-* Remove and correct obsolete image with name like <id>_somename.png
-* Report errors at the end of pulling
-
-=== 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/bin/wiki_pull_daily

@@ -1,28 +0,0 @@
-#!/bin/env ruby
-
-require 'elexis/wiki/interface/workspace'
-
-workspace =  Elexis::Wiki::Interface::Workspace.new(Dir.pwd)
-workspace.pull
-files = Dir.glob('doc_??') +
-    Dir.glob('*/doc/*.mediawiki') +
-    Dir.glob('*/doc/*.png')
-    Dir.glob('*/doc/*.jpg')
-    Dir.glob('*/doc/*.gif')
-(Dir.glob("doc_??/*") + Dir.glob('*/doc/*')).each{|f| files << f if File.symlink?(f) }
-files.each{
-  |file|
-  if /:/.match(File.basename(file))
-      puts "You may not add a file containg ':' or it will break git for Windows. Remove/rename #{file}"
-      exit 2
-  end
-}
-if true
-  system("git add -f #{files.join(' ')}")
-  system("git status")
-  system("git commit --all -m '#{File.basename(__FILE__)}: #{Date.today.to_s} from #{workspace.wiki.sub(/api.php/i, '')}'")
-  system("git status")
-  system("git log -1")
-  # system("git push")
-end
-workspace.show_missing(true)

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

@@ -1,7 +0,0 @@
-module Elexis
-  module Wiki
-    module Interface
-      VERSION = "0.4.8"
-    end
-  end
-end