mediawiki_api 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20db69d02e685dd6c01f43a617e783310b884784
-  data.tar.gz: 8ea86db0e30f32006981ba4e04779f0e8eb1b73c
+  metadata.gz: b2e13c62db930923fbfd515cb2029d9d43508b9a
+  data.tar.gz: dada9ee27c4c09a1a2c7a157828e16079beace62
 SHA512:
-  metadata.gz: c5c9196a44d8975fb8081273791487d88188ed4f452c892d656d2de940fc9e1049b61dd64ec14d2a71e7c0c6935109bfb006378eb697bd189f70536d10ed80b9
-  data.tar.gz: cd1f86124b668e951ec1a608be92ec7c6aee66273eb3c360da85b546ffd460d87427d16a4dcac23c5e0c476c5f77c207cdce673af3053bb4b9a9a3ce03bc21c9
+  metadata.gz: 145fc6da63febab8ffc18b4d32a6eda108232052fd927380357a7fdfc375eb482681c1ac339e3299f4fee62c3f05fac2e03d766cd401a891991af74a5eb35111
+  data.tar.gz: eba8ace9d4a58f8148c7e5601d6e216475fc0bce8612bd78bea5fab637a63ed46ffcd4b042cb9bad82d0ace755685d025c0b1d89ccf84567c9fc698aeccbf23e

data/.rubocop.yml

@@ -1 +1,33 @@
-inherit_from: .rubocop_todo.yml
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/ParameterLists:
+  Enabled: false
+
+Metrics/LineLength:
+  Max: 100
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Style/Alias:
+  Enabled: false
+
+Style/DotPosition:
+  Enabled: true
+  EnforcedStyle: trailing
+
+Style/SignalException:
+  Enabled: false

data/CREDITS

@@ -6,6 +6,7 @@ For further details on licensing, see the LICENSE file.
 
 == Developers ==
 * Amir Aharoni
+* Asaf Bartov
 * Chris McMahon
 * Dan Duvall
 * Jeff Hall

data/Gemfile

@@ -1,7 +1,7 @@
-#ruby=ruby-2.1.2
-#ruby-gemset=mediawiki_api
+# ruby=ruby-2.1.2
+# ruby-gemset=mediawiki_api
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in mediawiki_api.gemspec
 gemspec

data/README.md

@@ -54,6 +54,9 @@ See https://www.mediawiki.org/wiki/Gerrit
 
 ## Release notes
 
+### 0.3.1 2015-01-06
+- actions now automatically refresh token and re-submit action if first attempt returns 'badtoken'.
+
 ### 0.3.0 2014-10-14
 
 - HTTP 400 and 500 responses now result in an HttpError exception.

data/lib/mediawiki_api.rb

@@ -1 +1 @@
-require "mediawiki_api/client"
+require 'mediawiki_api/client'

data/lib/mediawiki_api/client.rb

@@ -1,17 +1,18 @@
-require "faraday"
-require "faraday-cookie_jar"
-require "json"
+require 'faraday'
+require 'faraday-cookie_jar'
+require 'json'
 
-require "mediawiki_api/exceptions"
-require "mediawiki_api/response"
+require 'mediawiki_api/exceptions'
+require 'mediawiki_api/response'
 
 module MediawikiApi
+  # high level client for MediaWiki
   class Client
-    FORMAT = "json"
+    FORMAT = 'json'
 
     attr_accessor :logged_in
 
-    alias logged_in? logged_in
+    alias_method :logged_in?, :logged_in
 
     def initialize(url, log = false)
       @conn = Faraday.new(url: url) do |faraday|
@@ -26,24 +27,14 @@ module MediawikiApi
     end
 
     def action(name, params = {})
-      name = name.to_s
-
-      method = params.delete(:http_method) || :post
-      token_type = params.delete(:token_type)
-      envelope = (params.delete(:envelope) || [name]).map(&:to_s)
-
-      params[:token] = get_token(token_type || name) unless token_type == false
-      params = compile_parameters(params)
-
-      response = @conn.send(method, "", params.merge(action: name, format: FORMAT))
-
-      raise HttpError, response.status if response.status >= 400
-
-      if response.headers.include?("mediawiki-api-error")
-        raise ApiError, Response.new(response, ["error"])
+      raw_action(name, params)
+    rescue ApiError => e
+      if e.code == 'badtoken'
+        @tokens.clear # ensure fresh token on re-try
+        raw_action(name, params) # no rescue this time; only re-try once.
+      else
+        raise # otherwise, propagate the exception
       end
-
-      Response.new(response, envelope)
     end
 
     def create_account(username, password, token = nil)
@@ -52,14 +43,14 @@ module MediawikiApi
 
       data = action(:createaccount, params).data
 
-      case data["result"]
-      when "Success"
+      case data['result']
+      when 'Success'
         @logged_in = true
         @tokens.clear
-      when "NeedToken"
-        data = create_account(username, password, data["token"])
+      when 'NeedToken'
+        data = create_account(username, password, data['token'])
       else
-        raise CreateAccountError, data["result"]
+        raise CreateAccountError, data['result']
       end
 
       data
@@ -75,12 +66,12 @@ module MediawikiApi
 
     def edit(params = {})
       response = action(:edit, params)
-      raise EditError, response if response.data["result"] == "Failure"
+      raise EditError, response if response.data['result'] == 'Failure'
       response
     end
 
     def get_wikitext(title)
-      @conn.get "/w/index.php", { action: "raw", title: title }
+      @conn.get '/w/index.php', action: 'raw', title: title
     end
 
     def list(type, params = {})
@@ -93,14 +84,14 @@ module MediawikiApi
 
       data = action(:login, params).data
 
-      case data["result"]
-      when "Success"
+      case data['result']
+      when 'Success'
         @logged_in = true
         @tokens.clear
-      when "NeedToken"
-        data = log_in(username, password, data["token"])
+      when 'NeedToken'
+        data = log_in(username, password, data['token'])
       else
-        raise LoginError, data["result"]
+        raise LoginError, data['result']
       end
 
       data
@@ -114,7 +105,7 @@ module MediawikiApi
       subquery(:prop, type, params)
     end
 
-    def protect_page(title, reason, protections = "edit=sysop|move=sysop")
+    def protect_page(title, reason, protections = 'edit=sysop|move=sysop')
       action(:protect, title: title, reason: reason, protections: protections)
     end
 
@@ -127,8 +118,10 @@ module MediawikiApi
     end
 
     def upload_image(filename, path, comment, ignorewarnings)
-      file = Faraday::UploadIO.new(path, "image/png")
-      action(:upload, token_type: "edit", filename: filename, file: file, comment: comment, ignorewarnings: ignorewarnings)
+      file = Faraday::UploadIO.new(path, 'image/png')
+      action(:upload,
+             token_type: 'edit', filename: filename, file: file, comment: comment,
+             ignorewarnings: ignorewarnings)
     end
 
     def watch_page(title)
@@ -143,7 +136,7 @@ module MediawikiApi
         when false
           # omit it entirely
         when Array
-          params[name] = value.join("|")
+          params[name] = value.join('|')
         else
           params[name] = value
         end
@@ -153,9 +146,10 @@ module MediawikiApi
     def get_token(type)
       unless @tokens.include?(type)
         response = action(:tokens, type: type, http_method: :get, token_type: false)
+        parameter_warning = /Unrecognized value for parameter 'type'/
 
-        if response.warnings? && response.warnings.grep(/Unrecognized value for parameter 'type'/).any?
-          raise TokenError, response.warnings.join(", ")
+        if response.warnings? && response.warnings.grep(parameter_warning).any?
+          raise TokenError, response.warnings.join(', ')
         end
 
         @tokens[type] = response.data["#{type}token"]
@@ -164,8 +158,34 @@ module MediawikiApi
       @tokens[type]
     end
 
+    def send_request(method, params, envelope)
+      response = @conn.send(method, '', params)
+
+      raise HttpError, response.status if response.status >= 400
+
+      if response.headers.include?('mediawiki-api-error')
+        raise ApiError, Response.new(response, ['error'])
+      end
+
+      Response.new(response, envelope)
+    end
+
     def subquery(type, subtype, params = {})
-      query(params.merge(type.to_sym => subtype, :envelope => ["query", subtype]))
+      query(params.merge(type.to_sym => subtype, :envelope => ['query', subtype]))
+    end
+
+    def raw_action(name, params = {})
+      name = name.to_s
+      params = params.clone
+
+      method = params.delete(:http_method) || :post
+      token_type = params.delete(:token_type)
+      envelope = (params.delete(:envelope) || [name]).map(&:to_s)
+
+      params[:token] = get_token(token_type || name) unless token_type == false
+      params = compile_parameters(params)
+
+      send_request(method, params.merge(action: name, format: FORMAT), envelope)
     end
   end
 end

data/lib/mediawiki_api/exceptions.rb

@@ -1,4 +1,5 @@
 module MediawikiApi
+  # generic MediaWiki api errors
   class ApiError < StandardError
     attr_reader :response
 
@@ -7,11 +8,11 @@ module MediawikiApi
     end
 
     def code
-      data["code"]
+      data['code']
     end
 
     def info
-      data["info"]
+      data['info']
     end
 
     def to_s
@@ -28,6 +29,7 @@ module MediawikiApi
   class CreateAccountError < StandardError
   end
 
+  # for errors from HTTP requests
   class HttpError < StandardError
     attr_reader :status
 
@@ -40,9 +42,10 @@ module MediawikiApi
     end
   end
 
+  # for edit failures
   class EditError < ApiError
     def to_s
-      "check the response data for details"
+      'check the response data for details'
     end
   end
 

data/lib/mediawiki_api/response.rb

@@ -1,5 +1,5 @@
-require "forwardable"
-require "json"
+require 'forwardable'
+require 'json'
 
 module MediawikiApi
   # Provides access to a parsed MediaWiki API responses.
@@ -51,16 +51,20 @@ module MediawikiApi
       end
     end
 
+    # Set of error messages from the response.
+    #
+    # @return [Array]
+    #
+    def errors
+      flatten_resp('errors')
+    end
+
     # Set of warning messages from the response.
     #
     # @return [Array]
     #
     def warnings
-      if response_object["warnings"]
-        response_object["warnings"].values.map(&:values).flatten
-      else
-        []
-      end
+      flatten_resp('warnings')
     end
 
     # Whether the response contains warnings.
@@ -73,6 +77,14 @@ module MediawikiApi
 
     private
 
+    def flatten_resp(str)
+      if response_object[str]
+        response_object[str].values.map(&:values).flatten
+      else
+        []
+      end
+    end
+
     def open_envelope(obj, env = @envelope)
       if !obj.is_a?(Hash) || env.nil? || env.empty? || !obj.include?(env.first)
         obj

data/lib/mediawiki_api/version.rb

@@ -1,3 +1,4 @@
+# MediaWiki Ruby API
 module MediawikiApi
-  VERSION = "0.3.0"
+  VERSION = '0.3.1'
 end

data/mediawiki_api.gemspec

@@ -1,29 +1,37 @@
 # coding: utf-8
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "mediawiki_api/version"
+require 'mediawiki_api/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "mediawiki_api"
+  spec.name          = 'mediawiki_api'
   spec.version       = MediawikiApi::VERSION
-  spec.authors       = ["Amir Aharoni", "Chris McMahon", "Dan Duvall", "Jeff Hall", "Juliusz Gonera", "Zeljko Filipin"]
-  spec.email         = ["amir.aharoni@mail.huji.ac.il", "cmcmahon@wikimedia.org", "dduvall@wikimedia.org", "jhall@wikimedia.org", "jgonera@wikimedia.org", "zeljko.filipin@gmail.com"]
-  spec.summary       = %q{A library for interacting with MediaWiki API from Ruby.}
-  spec.description   = %q{Uses adapter-agnostic Faraday gem to talk to MediaWiki API.}
-  spec.homepage      = "https://github.com/wikimedia/mediawiki-ruby-api"
-  spec.license       = "GPL-2"
+  spec.authors       = [
+    'Amir Aharoni', 'Asaf Bartov', 'Chris McMahon', 'Dan Duvall', 'Jeff Hall', 'Juliusz Gonera',
+    'Zeljko Filipin'
+  ]
+  spec.email         = [
+    'amir.aharoni@mail.huji.ac.il', 'asaf.bartov@gmail.com', 'cmcmahon@wikimedia.org',
+    'dduvall@wikimedia.org', 'jhall@wikimedia.org', 'jgonera@wikimedia.org',
+    'zeljko.filipin@gmail.com'
+  ]
+  spec.summary       = 'A library for interacting with MediaWiki API from Ruby.'
+  spec.description   = 'Uses adapter-agnostic Faraday gem to talk to MediaWiki API.'
+  spec.homepage      = 'https://github.com/wikimedia/mediawiki-ruby-api'
+  spec.license       = 'GPL-2'
 
-  spec.files         = `git ls-files`.split($/)
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  spec.test_files    = spec.files.grep(/^(test|spec|features)/)
+  spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency "faraday", "~> 0.9", ">= 0.9.0"
-  spec.add_runtime_dependency "faraday-cookie_jar", "~> 0.0", ">= 0.0.6"
+  spec.add_runtime_dependency 'faraday', '~> 0.9', '>= 0.9.0'
+  spec.add_runtime_dependency 'faraday-cookie_jar', '~> 0.0', '>= 0.0.6'
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake", "~> 0"
-  spec.add_development_dependency "rspec", "~> 3.0", ">= 3.0.0"
-  spec.add_development_dependency "webmock", "~> 1.17", ">= 1.17.2"
-  spec.add_development_dependency "redcarpet"
-  spec.add_development_dependency "yard"
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'rake', '~> 0'
+  spec.add_development_dependency 'rspec', '~> 3.0', '>= 3.0.0'
+  spec.add_development_dependency 'rubocop', '~> 0.26.1'
+  spec.add_development_dependency 'webmock', '~> 1.17', '>= 1.17.2'
+  spec.add_development_dependency 'redcarpet'
+  spec.add_development_dependency 'yard'
 end

data/spec/client_spec.rb

@@ -1,6 +1,6 @@
-require "spec_helper"
-require "webmock/rspec"
-require "support/request_helpers"
+require 'spec_helper'
+require 'webmock/rspec'
+require 'support/request_helpers'
 
 describe MediawikiApi::Client do
   include MediawikiApi::RequestHelpers
@@ -9,19 +9,22 @@ describe MediawikiApi::Client do
 
   subject { client }
 
-  body_base = { cookieprefix: "prefix", sessionid: "123" }
+  body_base = { cookieprefix: 'prefix', sessionid: '123' }
 
-  describe "#action" do
+  describe '#action' do
     subject { client.action(action, params) }
 
-    let(:action) { "something" }
+    let(:action) { 'something' }
     let(:token_type) { action }
     let(:params) { {} }
 
-    let(:response) { { status: response_status, headers: response_headers, body: response_body.to_json } }
+    let(:response) do
+      { status: response_status, headers: response_headers, body: response_body.to_json }
+    end
+
     let(:response_status) { 200 }
     let(:response_headers) { nil }
-    let(:response_body) { { "something" => {} } }
+    let(:response_body) { { 'something' => {} } }
 
     let(:token_warning) { nil }
 
@@ -32,13 +35,13 @@ describe MediawikiApi::Client do
 
     it { is_expected.to be_a(MediawikiApi::Response) }
 
-    it "makes requests for both the right token and API action" do
+    it 'makes requests for both the right token and API action' do
       subject
       expect(@token_request).to have_been_made
       expect(@request).to have_been_made
     end
 
-    context "without a required token" do
+    context 'without a required token' do
       let(:params) { { token_type: false } }
 
       before do
@@ -46,33 +49,33 @@ describe MediawikiApi::Client do
         @request_without_token = stub_api_request(:post, action: action).to_return(response)
       end
 
-      it "does not request a token" do
+      it 'does not request a token' do
         subject
         expect(@token_request).to_not have_been_made
       end
 
-      it "makes the action request without a token" do
+      it 'makes the action request without a token' do
         subject
         expect(@request_without_token).to have_been_made
         expect(@request_with_token).to_not have_been_made
       end
     end
 
-    context "given parameters" do
-      let(:params) { { foo: "value" } }
+    context 'given parameters' do
+      let(:params) { { foo: 'value' } }
 
       before do
-        @request_with_parameters = stub_action_request(action, foo: "value").to_return(response)
+        @request_with_parameters = stub_action_request(action, foo: 'value').to_return(response)
       end
 
-      it "includes them" do
+      it 'includes them' do
         subject
         expect(@request_with_parameters).to have_been_made
       end
     end
 
-    context "parameter compilation" do
-      context "negated parameters" do
+    context 'parameter compilation' do
+      context 'negated parameters' do
         let(:params) { { foo: false } }
 
         before do
@@ -80,136 +83,160 @@ describe MediawikiApi::Client do
           @request_without_parameter = stub_action_request(action).to_return(response)
         end
 
-        it "omits the parameter" do
+        it 'omits the parameter' do
           subject
           expect(@request_with_parameter).to_not have_been_made
           expect(@request_without_parameter).to have_been_made
         end
       end
 
-      context "array parameters" do
-        let(:params) { { foo: ["one", "two"] } }
+      context 'array parameters' do
+        let(:params) { { foo: %w(one two) } }
 
         before do
-          @request = stub_action_request(action, foo: "one|two").to_return(response)
+          @request = stub_action_request(action, foo: 'one|two').to_return(response)
         end
 
-        it "pipe delimits values" do
+        it 'pipe delimits values' do
           subject
           expect(@request).to have_been_made
         end
       end
     end
 
-    context "when the response status is in the 400 range" do
+    context 'when the response status is in the 400 range' do
       let(:response_status) { 403 }
 
-      it "raises an HttpError" do
-        expect { subject }.to raise_error(MediawikiApi::HttpError, "unexpected HTTP response (403)")
+      it 'raises an HttpError' do
+        expect { subject }.to raise_error(MediawikiApi::HttpError,
+                                          'unexpected HTTP response (403)')
       end
     end
 
-    context "when the response status is in the 500 range" do
+    context 'when the response status is in the 500 range' do
       let(:response_status) { 502 }
 
-      it "raises an HttpError" do
-        expect { subject }.to raise_error(MediawikiApi::HttpError, "unexpected HTTP response (502)")
+      it 'raises an HttpError' do
+        expect { subject }.to raise_error(MediawikiApi::HttpError,
+                                          'unexpected HTTP response (502)')
       end
     end
 
-    context "when the response is an error" do
-      let(:response_headers) { { "MediaWiki-API-Error" => "code" } }
-      let(:response_body) { { error: { info: "detailed message", code: "code" } } }
+    context 'when the response is an error' do
+      let(:response_headers) { { 'MediaWiki-API-Error' => 'code' } }
+      let(:response_body) { { error: { info: 'detailed message', code: 'code' } } }
 
-      it "raises an ApiError" do
-        expect { subject }.to raise_error(MediawikiApi::ApiError, "detailed message (code)")
+      it 'raises an ApiError' do
+        expect { subject }.to raise_error(MediawikiApi::ApiError, 'detailed message (code)')
       end
     end
 
-    context "given a bad token type" do
+    context 'given a bad token type' do
       let(:params) { { token_type: token_type } }
-      let(:token_type) { "badtoken" }
+      let(:token_type) { 'badtoken' }
       let(:token_warning) { "Unrecognized value for parameter 'type': badtoken" }
 
-      it "raises a TokenError" do
+      it 'raises a TokenError' do
         expect { subject }.to raise_error(MediawikiApi::TokenError, token_warning)
       end
     end
 
-    context "when the token response includes only other types of warnings (see bug 70066)" do
-      let(:token_warning) { "action=tokens has been deprecated. Please use action=query&meta=tokens instead." }
+    context 'when the token response includes only other types of warnings (see bug 70066)' do
+      let(:token_warning) do
+        'action=tokens has been deprecated. Please use action=query&meta=tokens instead.'
+      end
+
+      it 'raises no exception' do
+        expect { subject }.to_not raise_error
+      end
+    end
+
+    context 'when the token is invalid' do
+      let(:response_headers) { { 'MediaWiki-API-Error' => 'badtoken' } }
+      let(:response_body) { { error: { code: 'badtoken', info: 'Invalid token' } } }
 
-      it "raises no exception" do
+      before do
+        # Stub a second request without the error
+        @request.then.to_return(status: 200)
+      end
+
+      it 'rescues the initial exception' do
         expect { subject }.to_not raise_error
       end
+
+      it 'automatically retries the request' do
+        subject
+        expect(@token_request).to have_been_made.twice
+        expect(@request).to have_been_made.twice
+      end
     end
   end
 
-  describe "#log_in" do
+  describe '#log_in' do
 
-    it "logs in when API returns Success" do
+    it 'logs in when API returns Success' do
       stub_request(:post, api_url).
-        with(body: { format: "json", action: "login", lgname: "Test", lgpassword: "qwe123" }).
-        to_return(body: { login: body_base.merge({ result: "Success" }) }.to_json )
+        with(body: { format: 'json', action: 'login', lgname: 'Test', lgpassword: 'qwe123' }).
+        to_return(body: { login: body_base.merge(result: 'Success') }.to_json)
 
-      subject.log_in "Test", "qwe123"
+      subject.log_in 'Test', 'qwe123'
       expect(subject.logged_in).to be true
     end
 
-    context "when API returns NeedToken" do
+    context 'when API returns NeedToken' do
       before do
-        headers = { "Set-Cookie" => "prefixSession=789; path=/; domain=localhost; HttpOnly" }
-
         stub_request(:post, api_url).
-          with(body: { format: "json", action: "login", lgname: "Test", lgpassword: "qwe123" }).
+          with(body: { format: 'json', action: 'login', lgname: 'Test', lgpassword: 'qwe123' }).
           to_return(
-            body: { login: body_base.merge({ result: "NeedToken", token: "456" }) }.to_json,
-            headers: { "Set-Cookie" => "prefixSession=789; path=/; domain=localhost; HttpOnly" }
+            body: { login: body_base.merge(result: 'NeedToken', token: '456') }.to_json,
+            headers: { 'Set-Cookie' => 'prefixSession=789; path=/; domain=localhost; HttpOnly' }
           )
 
         @success_req = stub_request(:post, api_url).
-          with(body: { format: "json", action: "login", lgname: "Test", lgpassword: "qwe123", lgtoken: "456" }).
-          with(headers: { "Cookie" => "prefixSession=789" }).
-          to_return(body: { login: body_base.merge({ result: "Success" }) }.to_json )
+          with(body: { format: 'json', action: 'login',
+                       lgname: 'Test', lgpassword: 'qwe123', lgtoken: '456' }).
+          with(headers: { 'Cookie' => 'prefixSession=789' }).
+          to_return(body: { login: body_base.merge(result: 'Success') }.to_json)
       end
 
-      it "logs in" do
-        response = subject.log_in("Test", "qwe123")
+      it 'logs in' do
+        response = subject.log_in('Test', 'qwe123')
 
-        expect(response).to include("result" => "Success")
+        expect(response).to include('result' => 'Success')
         expect(subject.logged_in).to be true
       end
 
-      it "sends second request with token and cookies" do
-        response = subject.log_in("Test", "qwe123")
+      it 'sends second request with token and cookies' do
+        subject.log_in('Test', 'qwe123')
 
         expect(@success_req).to have_been_requested
       end
     end
 
-    context "when API returns neither Success nor NeedToken" do
+    context 'when API returns neither Success nor NeedToken' do
       before do
         stub_request(:post, api_url).
-          with(body: { format: "json", action: "login", lgname: "Test", lgpassword: "qwe123" }).
-          to_return(body: { login: body_base.merge({ result: "EmptyPass" }) }.to_json )
+          with(body: { format: 'json', action: 'login', lgname: 'Test', lgpassword: 'qwe123' }).
+          to_return(body: { login: body_base.merge(result: 'EmptyPass') }.to_json)
       end
 
-      it "does not log in" do
-        expect { subject.log_in "Test", "qwe123" }.to raise_error
+      it 'does not log in' do
+        expect { subject.log_in 'Test', 'qwe123' }.to raise_error
         expect(subject.logged_in).to be false
       end
 
-      it "raises error with proper message" do
-        expect { subject.log_in "Test", "qwe123" }.to raise_error MediawikiApi::LoginError, "EmptyPass"
+      it 'raises error with proper message' do
+        expect { subject.log_in 'Test', 'qwe123' }.to raise_error(MediawikiApi::LoginError,
+                                                                  'EmptyPass')
       end
     end
   end
 
-  describe "#create_page" do
+  describe '#create_page' do
     subject { client.create_page(title, text) }
 
-    let(:title) { "Test" }
-    let(:text) { "test123" }
+    let(:title) { 'Test' }
+    let(:text) { 'test123' }
     let(:response) { {} }
 
     before do
@@ -218,30 +245,31 @@ describe MediawikiApi::Client do
         to_return(body: response.to_json)
     end
 
-    it "makes the right request" do
+    it 'makes the right request' do
       subject
       expect(@edit_request).to have_been_requested
     end
   end
 
-  describe "#delete_page" do
+  describe '#delete_page' do
     before do
       stub_request(:get, api_url).
-        with(query: { format: "json", action: "tokens", type: "delete" }).
-        to_return(body: { tokens: { deletetoken: "t123" } }.to_json )
+        with(query: { format: 'json', action: 'tokens', type: 'delete' }).
+        to_return(body: { tokens: { deletetoken: 't123' } }.to_json)
       @delete_req = stub_request(:post, api_url).
-        with(body: { format: "json", action: "delete", title: "Test", reason: "deleting", token: "t123" })
+        with(body: { format: 'json', action: 'delete',
+                     title: 'Test', reason: 'deleting', token: 't123' })
     end
 
-    it "deletes a page using a delete token" do
-      subject.delete_page("Test", "deleting")
+    it 'deletes a page using a delete token' do
+      subject.delete_page('Test', 'deleting')
       expect(@delete_req).to have_been_requested
     end
 
     # evaluate results
   end
 
-  describe "#edit" do
+  describe '#edit' do
     subject { client.edit(params) }
 
     let(:params) { {} }
@@ -252,108 +280,113 @@ describe MediawikiApi::Client do
       @edit_request = stub_action_request(:edit).to_return(body: response.to_json)
     end
 
-    it "makes the request" do
+    it 'makes the request' do
       subject
       expect(@edit_request).to have_been_requested
     end
 
-    context "upon an edit failure" do
-      let(:response) { { edit: { result: "Failure" } } }
+    context 'upon an edit failure' do
+      let(:response) { { edit: { result: 'Failure' } } }
 
-      it "raises an EditError" do
+      it 'raises an EditError' do
         expect { subject }.to raise_error(MediawikiApi::EditError)
       end
     end
   end
 
-  describe "#get_wikitext" do
+  describe '#get_wikitext' do
     before do
-      @get_req = stub_request(:get, index_url).with(query: { action: "raw", title: "Test" })
+      @get_req = stub_request(:get, index_url).with(query: { action: 'raw', title: 'Test' })
     end
 
-    it "fetches a page" do
-      subject.get_wikitext("Test")
+    it 'fetches a page' do
+      subject.get_wikitext('Test')
       expect(@get_req).to have_been_requested
     end
   end
 
-  describe "#create_account" do
-    it "creates an account when API returns Success" do
+  describe '#create_account' do
+    it 'creates an account when API returns Success' do
       stub_request(:post, api_url).
-        with(body: { format: "json", action: "createaccount", name: "Test", password: "qwe123" }).
-        to_return(body: { createaccount: body_base.merge({ result: "Success" }) }.to_json )
+        with(body: { format: 'json', action: 'createaccount', name: 'Test', password: 'qwe123' }).
+        to_return(body: { createaccount: body_base.merge(result: 'Success') }.to_json)
 
-      expect(subject.create_account("Test", "qwe123")).to include("result" => "Success")
+      expect(subject.create_account('Test', 'qwe123')).to include('result' => 'Success')
     end
 
-    context "when API returns NeedToken" do
+    context 'when API returns NeedToken' do
       before do
-        headers = { "Set-Cookie" => "prefixSession=789; path=/; domain=localhost; HttpOnly" }
-
         stub_request(:post, api_url).
-          with(body: { format: "json", action: "createaccount", name: "Test", password: "qwe123" }).
+          with(body: { format: 'json', action: 'createaccount',
+                       name: 'Test', password: 'qwe123' }).
           to_return(
-            body: { createaccount: body_base.merge({ result: "NeedToken", token: "456" }) }.to_json,
-            headers: { "Set-Cookie" => "prefixSession=789; path=/; domain=localhost; HttpOnly" }
+            body: { createaccount: body_base.merge(result: 'NeedToken', token: '456') }.to_json,
+            headers: { 'Set-Cookie' => 'prefixSession=789; path=/; domain=localhost; HttpOnly' }
           )
 
         @success_req = stub_request(:post, api_url).
-          with(body: { format: "json", action: "createaccount", name: "Test", password: "qwe123", token: "456" }).
-          with(headers: { "Cookie" => "prefixSession=789" }).
-          to_return(body: { createaccount: body_base.merge({ result: "Success" }) }.to_json )
+          with(body: { format: 'json', action: 'createaccount',
+                       name: 'Test', password: 'qwe123', token: '456' }).
+          with(headers: { 'Cookie' => 'prefixSession=789' }).
+          to_return(body: { createaccount: body_base.merge(result: 'Success') }.to_json)
       end
 
-      it "creates an account" do
-        expect(subject.create_account("Test", "qwe123")).to include("result" => "Success")
+      it 'creates an account' do
+        expect(subject.create_account('Test', 'qwe123')).to include('result' => 'Success')
       end
 
-      it "sends second request with token and cookies" do
-        subject.create_account "Test", "qwe123"
+      it 'sends second request with token and cookies' do
+        subject.create_account 'Test', 'qwe123'
         expect(@success_req).to have_been_requested
       end
     end
 
     # docs don't specify other results, but who knows
     # http://www.mediawiki.org/wiki/API:Account_creation
-    context "when API returns neither Success nor NeedToken" do
+    context 'when API returns neither Success nor NeedToken' do
       before do
         stub_request(:post, api_url).
-          with(body: { format: "json", action: "createaccount", name: "Test", password: "qwe123" }).
-          to_return(body: { createaccount: body_base.merge({ result: "WhoKnows" }) }.to_json )
+          with(body: { format: 'json', action: 'createaccount',
+                       name: 'Test', password: 'qwe123' }).
+          to_return(body: { createaccount: body_base.merge(result: 'WhoKnows') }.to_json)
       end
 
-      it "raises error with proper message" do
-        expect { subject.create_account "Test", "qwe123" }.to raise_error MediawikiApi::CreateAccountError, "WhoKnows"
+      it 'raises error with proper message' do
+        expect { subject.create_account 'Test', 'qwe123' }.to raise_error(
+          MediawikiApi::CreateAccountError,
+          'WhoKnows'
+        )
       end
     end
   end
 
-  describe "#watch_page" do
+  describe '#watch_page' do
     before do
       stub_request(:get, api_url).
-        with(query: { format: "json", action: "tokens", type: "watch" }).
-        to_return(body: { tokens: { watchtoken: "t123" } }.to_json )
+        with(query: { format: 'json', action: 'tokens', type: 'watch' }).
+        to_return(body: { tokens: { watchtoken: 't123' } }.to_json)
       @watch_req = stub_request(:post, api_url).
-        with(body: { format: "json", token: "t123", action: "watch", titles: "Test" })
+        with(body: { format: 'json', token: 't123', action: 'watch', titles: 'Test' })
     end
 
-    it "sends a valid watch request" do
-      subject.watch_page("Test")
+    it 'sends a valid watch request' do
+      subject.watch_page('Test')
       expect(@watch_req).to have_been_requested
     end
   end
 
-  describe "#unwatch_page" do
+  describe '#unwatch_page' do
     before do
       stub_request(:get, api_url).
-        with(query: { format: "json", action: "tokens", type: "watch" }).
-        to_return(body: { tokens: { watchtoken: "t123" } }.to_json )
+        with(query: { format: 'json', action: 'tokens', type: 'watch' }).
+        to_return(body: { tokens: { watchtoken: 't123' } }.to_json)
       @watch_req = stub_request(:post, api_url).
-        with(body: { format: "json", token: "t123", action: "watch", titles: "Test", unwatch: "true" })
+        with(body: { format: 'json', token: 't123', action: 'watch',
+                     titles: 'Test', unwatch: 'true' })
     end
 
-    it "sends a valid unwatch request" do
-      subject.unwatch_page("Test")
+    it 'sends a valid unwatch request' do
+      subject.unwatch_page('Test')
       expect(@watch_req).to have_been_requested
     end
   end