mediawiki-gateway 0.6.1 → 0.6.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjkxNDFhNzdhOGU1ZjU2YjIwNjA5YmI5MDQzYTg3YjBjZjMwNWI1Mg==
-  data.tar.gz: !binary |-
-    OWE3MjhiNjU1N2I2NzE4NWRmMGZmNmI0MGYyYmZhNTI5NjkyYmY5Ng==
+SHA1:
+  metadata.gz: 2024bd23d67918a2bf7d38216a70da0bf8f60cb4
+  data.tar.gz: a0a8252820764951697436d9b957126b4f9f3c83
 SHA512:
-  metadata.gz: !binary |-
-    ZDRhMGVkZGM3ODI4MDg4MTRhNDU0NDU1YzdmZDhkZTBmNjhhZjg4NTE2ZGMy
-    ZjE0MGE5NTQ5NTFmOTU0ODEyODE4MTUzMjE0ODM5ODcxZDkxZDQ0MGE0NTBh
-    NzM1N2UxOGRlNDJmMzkyYzk1ODg5ODlhNjQyYjUxYmQyMTdjY2M=
-  data.tar.gz: !binary |-
-    MTI4N2Q2Y2Q2ZmYzNjdhMjBmNGQ5MzcwNzczMzRhYzdjMDNkNWIyYjNiYmU0
-    OTRiZjkzMzVkOWFkNzliOTI3OTdmYjg3MjMzMjRmOTY4ZWQxMjU0ZGYzZDEy
-    ZWY4NTQ3OTdlNWQxY2ViZjkyZWMyM2U0YmJiZDFlMTAzMTE1M2I=
+  metadata.gz: c84e686ef4362878482dddb8decd812a3886442388fc243c6fe2a35719a1326691ab1d0cd6b0c94c78a07a5004e013761a083877363c34e45035b093f41612f2
+  data.tar.gz: e3e8f94661cae3ba07edba0eb5b2a6a67d41e4359fc620cecb6b4688f8f6db8014eea597aeae2bb493e6ca445d8f1536a362386a126b88a79c83b752a41ccbda

data/README.md

@@ -40,13 +40,17 @@ To build and install the gem use:
 
     bundle exec rake install
 
+### Testing against a live MediaWiki instance
+
+You need to have [Docker](https://docker.com) and [mediawiki-testwiki](https://rubygems.org/gems/mediawiki-testwiki) installed.
+
 ## Status
 
 This gem is no longer in active development.  Pull requests that fix bugs or add new features are more than welcome, but asking for new features is unlikely to make them materialize out of thin air.
 
 ## Credits
 
-Maintained by Jani Patokallio.
+Loosely maintained by Jani Patokallio and [Jens Wille](https://github.com/blackwinter).  If you'd be seriously interested in joining as an active maintainer, drop us a line!
 
 Thanks to:
 * John Carney, Mike Williams, Daniel Heath and the rest of the Lonely Planet Atlas team.

data/lib/media_wiki/gateway.rb

@@ -668,6 +668,26 @@ module MediaWiki
       )).first
     end
 
+    # Get the wiki's siteinfo as a hash. See http://www.mediawiki.org/wiki/API:Siteinfo.
+    #
+    # [options] Hash of additional options
+    def siteinfo(options = {})
+      res = make_api_request(options.merge(
+        'action' => 'query',
+        'meta'   => 'siteinfo'
+      )).first
+
+      REXML::XPath.first(res, '//query/general')
+        .attributes.each_with_object({}) { |(k, v), h| h[k] = v }
+    end
+
+    # Get the wiki's MediaWiki version.
+    #
+    # [options] Hash of additional options passed to #siteinfo
+    def version(options = {})
+      siteinfo(options).fetch('generator', '').split.last
+    end
+
     # Get a list of all known namespaces
     #
     # [options] Hash of additional options

data/lib/media_wiki.rb

@@ -5,5 +5,5 @@ require File.dirname(__FILE__) + '/media_wiki/utils'
 require File.dirname(__FILE__) + '/media_wiki/gateway'
 
 module MediaWiki
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/mediawiki-gateway.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: mediawiki-gateway 0.6.1 ruby lib
+# stub: mediawiki-gateway 0.6.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "mediawiki-gateway"
-  s.version = "0.6.1"
+  s.version = "0.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Jani Patokallio"]
-  s.date = "2014-07-28"
+  s.date = "2014-09-29"
   s.description = ""
   s.email = "jpatokal@iki.fi"
   s.extra_rdoc_files = [
@@ -51,11 +51,12 @@ Gem::Specification.new do |s|
     "spec/fake_media_wiki/query_handling.rb",
     "spec/gateway_spec.rb",
     "spec/import-test-data.xml",
+    "spec/live_gateway_spec.rb",
     "spec/spec_helper.rb",
     "spec/utils_spec.rb"
   ]
   s.homepage = "http://github.com/jpatokal/mediawiki-gateway"
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.4.1"
   s.summary = "Connect to the mediawiki API"
 
   if s.respond_to? :specification_version then

data/spec/fake_media_wiki/query_handling.rb

@@ -91,9 +91,16 @@ module FakeMediaWiki
     end
     
     def siteinfo
-      siteinfo_type = params[:siprop].to_sym
-      return send(siteinfo_type) if respond_to?(siteinfo_type)
-      halt(404, "Page not found")
+      if siteinfo_type = params[:siprop]
+        return send(siteinfo_type) if respond_to?(siteinfo_type)
+        halt(404, "Page not found")
+      else
+        api_response do |_|
+          _.query do
+            _.general(generator: "MediaWiki #{MediaWiki::VERSION}")
+          end
+        end
+      end
     end
     
     def namespaces

data/spec/gateway_spec.rb

@@ -719,6 +719,32 @@ describe MediaWiki::Gateway do
 
   end
 
+  describe "#siteinfo" do
+
+    before do
+      $fake_media_wiki.reset
+      @siteinfo = @gateway.siteinfo
+    end
+
+    it "should get the siteinfo" do
+      @siteinfo.should == { 'generator' => "MediaWiki #{MediaWiki::VERSION}" }
+    end
+
+  end
+
+  describe "#version" do
+
+    before do
+      $fake_media_wiki.reset
+      @version = @gateway.version
+    end
+
+    it "should get the version" do
+      @version.should == MediaWiki::VERSION
+    end
+
+  end
+
   describe "#namespaces_by_prefix" do
 
     before do

data/spec/live_gateway_spec.rb

@@ -0,0 +1,765 @@
+require 'spec_helper'
+
+shared_examples 'live gateway' do
+
+  def reset(*args, &block)
+    return unless respond_to?(:live_media_wiki_reset, true)
+    @gateway, @user, @pass = live_media_wiki_reset(*args, &block)
+  end
+
+  before do
+    reset
+  end
+
+  it 'should match requested version' do |example|
+    @gateway.version.should == example.metadata[:version]
+  end
+
+  describe '#login' do
+
+    describe 'with a valid username & password' do
+
+      it 'should login successfully with the default domain' do
+        @gateway.login(@user, @pass).should == @user
+      end
+
+    end
+
+    describe 'with a non-existent username' do
+
+      it 'should raise an error' do
+        lambda {
+          @gateway.login(@user.swapcase, @pass)
+        }.should raise_error(MediaWiki::Unauthorized)
+      end
+
+    end
+
+    describe 'with an incorrect password' do
+
+      it 'should raise an error' do
+        lambda {
+          @gateway.login(@user, @pass.swapcase)
+        }.should raise_error(MediaWiki::Unauthorized)
+      end
+
+    end
+
+  end
+
+  describe '#get_token' do
+
+    before do
+      @blank_token = '+\\'
+    end
+
+    describe 'when not logged in' do
+
+      describe 'requesting an edit token' do
+
+        it 'should return a blank token' do
+          token = @gateway.send(:get_token, 'edit', 'Main Page')
+
+          token.should_not be_nil
+          token.should == @blank_token
+        end
+
+      end
+
+      describe 'requesting an import token' do
+
+        it 'should raise an error' do
+          lambda {
+            @gateway.send(:get_token, 'import', 'Main Page')
+          }.should raise_error(MediaWiki::APIError, /not allowed/)
+        end
+
+      end
+
+    end
+
+    describe 'when logged in as admin user' do
+
+      before do
+        @gateway.login(@user, @pass)
+      end
+
+      describe 'requesting an edit token for a single page' do
+
+        it 'should return a token' do
+          token = @gateway.send(:get_token, 'edit', 'Main Page')
+
+          token.should_not be_nil
+          token.should_not == @blank_token
+        end
+
+      end
+
+      describe 'requesting an edit token for multiple pages' do
+
+        it 'should return a token' do
+          token = @gateway.send(:get_token, 'edit', 'Main Page|Another Page')
+
+          token.should_not be_nil
+          token.should_not == @blank_token
+        end
+
+      end
+
+      describe 'requesting an import token' do
+
+        it 'should return a token' do
+          token = @gateway.send(:get_token, 'import', 'Main Page')
+
+          token.should_not be_nil
+          token.should_not == @blank_token
+        end
+
+      end
+
+    end
+
+  end
+
+  describe '#get' do
+
+    describe 'for an existing wiki page' do
+
+      it 'returns raw page content' do
+        content = @gateway.get('Main Page')
+        content.should be_an_instance_of(String)
+        content.should include('MediaWiki has been successfully installed.')  # XXX
+      end
+
+    end
+
+    describe 'for an existing empty wiki page' do
+
+      it 'returns an empty string', skip: '(page does not exist)' do
+        @gateway.get('Empty').should == ''
+      end
+
+    end
+
+    describe 'for a missing wiki page' do
+
+      it 'returns nil' do
+        @gateway.get('page/missing').should be_nil
+      end
+
+    end
+
+    describe 'for root (/)' do
+
+      it 'returns nil' do
+        @gateway.get('').should be_nil
+      end
+
+    end
+
+    describe 'when wiki returns 503' do
+
+      before do
+        @log = double(debug: nil, warn: nil)
+        @fail_gateway = live_media_wiki_gateway(maxlag: -1, retry_delay: 0)
+
+        allow(@fail_gateway).to receive(:log) { @log }
+      end
+
+      it 'should retry twice and fail', skip: 'expected Exception but nothing was raised' do
+        lambda { @fail_gateway.get('') }.should raise_error
+
+        @log.should have_received(:warn).with(
+          '503 Service Unavailable: Maxlag exceeded.  Retry in 0 seconds.').twice
+      end
+
+    end
+
+    it 'should pass options to RestClient::Request' do
+      gateway = live_media_wiki_gateway({}, verify_ssl: false)
+
+      RestClient::Request.should receive(:execute).with(
+        hash_including(verify_ssl: false)).and_return([double(elements: {})])
+
+      gateway.get('').should be_nil
+    end
+
+  end
+
+  describe '#redirect?' do
+
+    describe 'for an existing redirect page' do
+
+      it 'returns true', skip: '(page does not exist)' do
+        @gateway.redirect?('Redirect').should == true
+      end
+
+    end
+
+    describe 'for an existing non-redirect page' do
+
+      it 'returns false' do
+        @gateway.redirect?('Main Page').should == false
+      end
+
+    end
+
+    describe 'for a missing wiki page' do
+
+      it 'returns false' do
+        @gateway.redirect?('page/missing').should == false
+      end
+
+    end
+
+  end
+
+  describe '#render' do
+
+    describe 'for an existing wiki page' do
+
+      it 'should return the page content' do
+        @gateway.render('Main Page').to_s.should include('MediaWiki has been successfully installed.')  # XXX
+      end
+
+      it 'should raise an ArgumentError on illegal options' do
+        lambda {
+          @gateway.render('Main Page', doesnotexist: :at_all)
+        }.should raise_error(ArgumentError)
+      end
+
+      describe 'with option' do
+
+        it 'should strip img tags', skip: '(page does not exist)' do
+          page = @gateway.render('Foopage', noimages: true)
+
+          page.to_s.should == 'Sample <B>HTML</B> content.' <<
+            '<span class="editsection">[<a title="Edit section: Nomenclature" href="/w/index.php?title=Seat_of_local_government&amp;action=edit&amp;section=1">edit</a>]</span>' <<
+            '<a title="Interpreted language" href="/wiki/Interpreted_language">interpreted language</a>'
+        end
+
+        it 'should strip edit sections', skip: '(page does not exist)' do
+          page = @gateway.render('Foopage', noeditsections: true)
+
+          page.to_s.should == 'Sample <B>HTML</B> content.' <<
+            '<img width="150" height="150" class="thumbimage" src="http://upload.wikimedia.org/foo/Ruby_logo.svg" alt="Ruby logo.svg"/>' <<
+            '<a title="Interpreted language" href="/wiki/Interpreted_language">interpreted language</a>'
+        end
+
+        it 'should make all links absolute', skip: '(page does not exist)' do
+          page = @gateway.render('Foopage', linkbase: 'http://en.wikipedia.org')
+
+          page.to_s.should == 'Sample <B>HTML</B> content.' <<
+            '<img width="150" height="150" class="thumbimage" src="http://upload.wikimedia.org/foo/Ruby_logo.svg" alt="Ruby logo.svg"/>' <<
+            '<span class="editsection">[<a title="Edit section: Nomenclature" href="/w/index.php?title=Seat_of_local_government&amp;action=edit&amp;section=1">edit</a>]</span>' <<
+            '<a title="Interpreted language" href="http://en.wikipedia.org/wiki/Interpreted_language">interpreted language</a>'
+        end
+
+      end
+
+    end
+
+    describe 'for a missing wiki page' do
+
+      it 'should return nil', skip: 'missingtitle: The page you specified doesn\'t exist' do
+        @gateway.render('Invalidpage').should be_nil
+      end
+
+    end
+
+  end
+
+  describe '#create' do
+
+    before do
+      @gateway.login(@user, @pass)
+    end
+
+    describe 'when creating a new page' do
+
+      it 'should create the page' do
+        page = @gateway.create(title = 'A New Page', 'Some content')
+
+        hash = Hash.from_xml(page.first.to_s)['api']['edit']
+        hash['new'].should == ''
+        hash['title'].should == title
+        hash['result'].should == 'Success'
+        hash['newrevid'].to_i.should > hash['oldrevid'].to_i
+      end
+
+    end
+
+    describe 'when creating a page that already exists' do
+
+      before do
+        reset
+      end
+
+      describe 'and the `overwrite` option is set' do
+
+        it 'should overwrite the existing page' do
+          page = @gateway.create(title = 'Main Page', 'Some new content', summary: 'The summary', overwrite: true)
+
+          hash = Hash.from_xml(page.first.to_s)['api']['edit']
+          hash['new'].should be_nil
+          hash['title'].should == title
+          hash['result'].should == 'Success'
+          hash['newrevid'].to_i.should > hash['oldrevid'].to_i
+        end
+
+      end
+
+      describe 'and the `overwrite` option is not set' do
+
+        it 'should raise an error' do
+          lambda {
+            @gateway.create('Main Page', 'Some new content')
+          }.should raise_error(MediaWiki::APIError)
+        end
+
+      end
+
+    end
+
+  end
+
+  describe '#edit' do
+
+    it 'should overwrite the existing page', skip: '(result differs)' do
+      reset
+
+      page = @gateway.edit('Main Page', 'Some new content')
+
+      Hash.from_xml(page.first.to_s).should == Hash.from_xml(<<-EOT)
+        <api>
+          <edit result="Success" pageid="8" title="Main Page" oldrevid="1" newrevid="8"/>
+        </api>
+      EOT
+    end
+
+  end
+
+  describe '#upload' do
+
+    before do
+      @gateway.login(@user, @pass)
+    end
+
+    describe 'when uploading a new file', skip: 'badupload_file: File upload param file is not a file upload' do
+
+      before do
+        @path = 'some/path/sample_image.jpg'
+        allow(File).to receive(:new).with(@path).and_return('SAMPLEIMAGEDATA')
+
+        @page = @gateway.upload(@path)
+      end
+
+      it 'should open the file' do
+        File.should have_received(:new).with(@path)
+      end
+
+      it 'should upload the file' do
+        Hash.from_xml(@page.first.to_s).should == Hash.from_xml(<<-EOT)
+          <api>
+            <upload result="Success" filename="sample_image.jpg"/>
+          </api>
+        EOT
+      end
+
+    end
+
+  end
+
+  describe '#delete' do
+
+    def delete_page
+      title, content = 'Deletable Page', 'Some content'
+
+      @gateway.send(:make_api_request,
+        'action'     => 'edit',
+        'title'      => title,
+        'text'       => content,
+        'summary'    => '',
+        'createonly' => '',
+        'token'      => @gateway.send(:get_token, 'edit', title)
+      )
+
+      yield lambda { @gateway.delete(title) }
+    end
+
+    describe 'when logged in as admin' do
+
+      describe 'and the page exists' do
+
+        it 'should delete the page' do
+          @gateway.login(@user, @pass)
+
+          delete_page { |block|
+            Hash.from_xml(block.call.first.to_s) == Hash.from_xml(<<-EOT)
+              <api>
+                <delete title="Deletable Page" reason="Default reason"/>
+              </api>
+            EOT
+          }
+        end
+
+      end
+
+      describe 'and the page does not exist' do
+
+        before do
+          @gateway.login(@user, @pass)
+        end
+
+        it 'should raise an error' do
+          lambda {
+            @gateway.delete('Missing Page')
+          }.should raise_error(MediaWiki::APIError)
+        end
+
+      end
+
+    end
+
+    describe 'when not logged in' do
+
+      it 'should raise an error' do
+        delete_page { |block| block.should raise_error(MediaWiki::APIError) }
+      end
+
+    end
+
+  end
+
+  describe '#undelete' do
+
+    describe 'when logged in as admin' do
+
+      before do
+        reset
+        @gateway.login(@user, @pass)
+      end
+
+      describe 'and the page no longer exists', skip: '(page does not exist)' do
+
+        before do
+          @revs = @gateway.undelete('Sandbox:Undeleted')
+        end
+
+        it 'should recreate the given page' do
+          @gateway.list('Sandbox:Undeleted').should == ['Sandbox:Undeleted']
+        end
+
+        it 'should report one undeleted revision' do
+          @revs.should == 1
+        end
+      end
+
+      describe 'but the page exists' do
+
+        before do
+          @revs = @gateway.undelete('Main Page')
+        end
+
+        it 'should report zero undeleted revisions' do
+          @revs.should == 0
+        end
+
+      end
+
+    end
+
+    describe 'when not logged in' do
+
+      it 'should raise an error' do
+        lambda {
+          @gateway.undelete('Undeletable Page')
+        }.should raise_error(MediaWiki::APIError)
+      end
+
+    end
+
+  end
+
+  describe '#list', skip: '(pages do not exist)' do
+
+    before do
+      reset
+    end
+
+    describe 'with an empty key' do
+
+      it 'should list all pages' do
+        @gateway.list('').sort.should == ['Book:Italy', 'Empty', 'Foopage', 'Level/Level/Index', 'Main 2', 'Main Page', 'Redirect']
+      end
+
+    end
+
+    describe 'with a namespace as the key' do
+
+      it 'should list all pages in the namespace' do
+        @gateway.list('Book:').should == ['Book:Italy']
+      end
+
+    end
+
+    describe 'with a partial title as the key' do
+
+      it 'should list all pages in the main namespace that start with key' do
+        @gateway.list('Main').sort.should == ['Main 2', 'Main Page']
+      end
+
+    end
+
+  end
+
+  describe '#search' do
+
+    before :all do
+      reset { |gateway|
+        gateway.create('Search Test', 'Foo KEY Blah')
+        gateway.create('Search Test 2', 'Zomp KEY Zorg')
+        gateway.create('Book:Search Test', 'Bar KEY Baz')
+        gateway.create('Sandbox:Search Test', 'Evil KEY Evil')
+      }
+    end
+
+    before do
+      # warning: srlimit may not be over 50 (set to 500) for users
+      @gateway = live_media_wiki_gateway(limit: 50)
+    end
+
+    describe 'with an empty key' do
+
+      it 'should raise an error' do
+        lambda {
+          @gateway.search('')
+        }.should raise_error(MediaWiki::APIError)
+      end
+
+    end
+
+    describe 'with a valid key and no namespaces', skip: '(searches all namespaces)' do
+
+      it 'should list all matching pages in the main namespace' do
+        @gateway.search('KEY').should =~ ['Search Test', 'Search Test 2']
+      end
+
+    end
+
+    describe 'with a valid key and a namespace string', skip: '(searches all namespaces)' do
+
+      it 'should list all matching pages in the specified namespaces' do
+        @gateway.search('KEY', 'Book').should == ['Book:Search Test']
+      end
+
+    end
+
+    describe 'with a valid key and a namespace array', skip: 'warning: Unrecognized values for parameter \'srnamespace\'' do
+
+      it 'should list all matching pages in the specified namespaces' do
+        @gateway.search('KEY', ['Book', 'Sandbox']).should =~ ['Sandbox:Search Test', 'Book:Search Test']
+      end
+
+    end
+
+    describe 'with maximum number of results' do
+
+      it 'should return at most the maximum number of results asked', skip: 'undefined method `to_i\' for sroffset=\'1\':REXML::Attribute' do
+        @gateway.search('KEY', nil, 2, 1).size.should == 1
+      end
+
+    end
+
+  end
+
+  describe '#namespaces_by_prefix' do
+
+    it 'should list all namespaces', skip: '(actual namespaces differ)' do
+      reset
+      @gateway.namespaces_by_prefix.should == { '' => 0, 'Book' => 100, 'Sandbox' => 200 }
+    end
+
+  end
+
+  describe '#semantic_query', skip: 'Semantic MediaWiki extension not installed' do
+
+    it 'should return an HTML string' do
+      response = @gateway.semantic_query('[[place::123]]', ['mainlabel=Page'])
+      response.should include('MediaWiki has been successfully installed.')  # XXX
+    end
+
+  end
+
+  describe '#import' do
+
+    before do
+      @import_file = File.dirname(__FILE__) + '/import-test-data.xml'
+    end
+
+    describe 'when not logged in' do
+
+      it 'should raise an error' do
+        lambda {
+          @gateway.import(@import_file)
+        }.should raise_error(MediaWiki::APIError)
+      end
+
+    end
+
+    describe 'when logged in as admin' do
+
+      it 'should import content' do
+        @gateway.login(@user, @pass)
+
+        page = @gateway.import(@import_file)
+
+        Hash.from_xml(page.first.to_s) == Hash.from_xml(<<-EOT)
+          <api>
+            <import>
+              <page title="Main Page" ns="0" revisions="0"/>
+              <page title="Template:Header" ns="10" revisions="1"/>
+            </import>
+          </api>
+        EOT
+      end
+
+    end
+
+  end
+
+  describe '#export' do
+
+    it 'should return export data for the page' do
+      page = @gateway.export(title = 'Main Page')
+
+      hash = Hash.from_xml(page.to_s)['mediawiki']['page']
+      hash['id'].should_not be_nil
+      hash['title'].should == title
+      hash['revision'].should be_an_instance_of(Hash)
+    end
+
+  end
+
+  describe '#extensions' do
+
+    it 'should list all extensions', skip: '(extensions are not installed)' do
+      reset
+      @gateway.extensions.should == { 'FooExtension' => 'r1', 'BarExtension' => 'r2', 'Semantic MediaWiki' => '1.5' }
+    end
+
+  end
+
+  describe '#create_account' do
+
+    describe 'when logged in as admin' do
+
+      before do
+        @gateway.login(@user, @pass)
+      end
+
+      it 'should get expected result' do
+        page = @gateway.create_account('name' => name = 'FooBar', 'password' => 'BarBaz')
+
+        hash = Hash.from_xml(page.to_s)['api']['createaccount']
+        hash['token'].should_not be_nil
+        hash['userid'].should_not be_nil
+        hash['result'].should == 'Success'
+        hash['username'].should == name
+      end
+
+    end
+
+  end
+
+  describe '#options' do
+
+    describe 'when logged in' do
+
+      before do
+        @gateway.login(@user, @pass)
+      end
+
+      describe 'requesting an options token' do
+
+        it 'should return a token' do
+          token = @gateway.send(:get_options_token)
+
+          token.should_not be_nil
+          token.should_not == '+\\'
+        end
+
+      end
+
+      it 'should return the expected response', skip: 'warning: Validation error for \'realname\': cannot be set by this module' do
+        Hash.from_xml(@gateway.options(realname: 'Bar Baz').to_s).should == Hash.from_xml('<api options="success" />')
+      end
+
+    end
+
+  end
+
+  describe '#user_rights' do
+
+    describe 'when logged in as admin' do
+
+      before do
+        @gateway.login(@user, @pass)
+      end
+
+      describe 'requesting a userrights token for an existing user' do
+
+        it 'should return a token', skip: '(user does not exist)' do
+          token = @gateway.send(:get_userrights_token, 'nonadmin')
+
+          token.should_not be_nil
+          token.should_not == '+\\'
+        end
+      end
+
+      describe 'requesting a userrights token for an nonexistant user' do
+
+        it 'should raise an error' do
+          lambda {
+            @gateway.send(:get_userrights_token, 'nosuchuser')
+          }.should raise_error(MediaWiki::APIError)
+        end
+      end
+
+      describe "changing a user's groups with a valid token" do
+
+        it 'should return a result matching the input', skip: '(user does not exist)' do
+          token  = @gateway.send(:get_userrights_token, 'nonadmin')
+          result = @gateway.send(:userrights, 'nonadmin', token, 'newgroup', 'oldgroup', 'because I can')
+
+          Hash.from_xml(@result.to_s).should == Hash.from_xml(<<-EOT)
+            <api>
+              <userrights user="nonadmin">
+                <removed>
+                  <group>oldgroup</group>
+                </removed>
+                <added>
+                  <group>newgroup</group>
+                </added>
+              </userrights>
+            </api>
+          EOT
+        end
+
+      end
+
+    end
+
+  end
+
+end
+
+unless (pool_size = Integer(ENV['LIVE_POOL_SIZE'] || 2)) > 1
+  warn 'Docker pool size must be greater than 1.'
+else
+  ENV.fetch('LIVE_VERSION', '1.23.4').split(/[\s:,]/).each { |version|
+    describe_live(MediaWiki::Gateway, version: version, pool_size: pool_size) {
+      include_examples 'live gateway'
+    }
+  }
+end

data/spec/spec_helper.rb

@@ -11,6 +11,16 @@ RSpec.configure { |config|
   %w[expect mock].each { |what|
     config.send("#{what}_with", :rspec) { |c| c.syntax = [:should, :expect] }
   }
+
+  config.alias_example_group_to :describe_live, begin
+    require 'media_wiki/test_wiki/rspec_adapter'
+  rescue LoadError
+    { skip: 'MediaWiki::TestWiki not available'.tap { |msg|
+      warn "#{msg}. Install it with: gem install mediawiki-testwiki" } }
+  else
+    { live: true }.tap { |filter|
+      MediaWiki::TestWiki::RSpecAdapter.enhance(config, filter) }
+  end
 }
 
 # :nodoc: Rails 2.3.x: Hash#to_xml is defined in active_support

metadata

@@ -1,209 +1,209 @@
 --- !ruby/object:Gem::Specification
 name: mediawiki-gateway
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Jani Patokallio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2014-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   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: atomic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sham_rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: ''
@@ -214,8 +214,8 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- .ruby-version
-- .rvmrc
+- ".ruby-version"
+- ".rvmrc"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -246,6 +246,7 @@ files:
 - spec/fake_media_wiki/query_handling.rb
 - spec/gateway_spec.rb
 - spec/import-test-data.xml
+- spec/live_gateway_spec.rb
 - spec/spec_helper.rb
 - spec/utils_spec.rb
 homepage: http://github.com/jpatokal/mediawiki-gateway
@@ -257,12 +258,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []