mediawiki_api 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47ada7ae6cca60fe668ec85a2db600bc2c8476d3
-  data.tar.gz: 1404eb28565f5c58106dd534426a1d29de9686bb
+  metadata.gz: 05fde886762b19553fe636b7e7d8cccb220a7481
+  data.tar.gz: 37036c78dcbd186c31f9da0a08f754f7931d1daa
 SHA512:
-  metadata.gz: d19e7cceb2b8436cfcae8198eba6d220ef333bf8b9397328929dec24a7b68bd738e24118b4994d60c19639514d3f85fc636bcef525ba5ce9a038d20555274b91
-  data.tar.gz: d1911e5759b7ac06de105c3728c7afbb50a3eec5e79549dfe2d92bdbe45f861ea91cc7d1827a40032350867a274feca6cbe8aee9f0fbca1763c9465b67f3390c
+  metadata.gz: ab02ae9dd0aaca8aac8c4d4bd08a8a9dabe2e907b2b6f656575d1ee29be059f4a39eb8802e720360c36b301e198a8579648802d4accfaf132d5416961d50ab50
+  data.tar.gz: e18cd950e866512999fb22e86fc7021ce260d99935f8f558b782ef75c38ad6e7aa4fa2df03e99970742e165f9bc17dd4033320c0785cc7948f760453b7c0cf4c

data/README.md

@@ -50,14 +50,14 @@ MediaWiki API gem at: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/m
 
 ## Contributing
 
-1. Fork it ( http://github.com/<my-github-username>/mediawiki_api/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am "Add some feature"`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+See https://www.mediawiki.org/wiki/Gerrit
 
 ## Release notes
 
+### 0.2.1 2014-08-26
+
+- Fix error handling for token requests
+
 ### 0.2.0 2014-08-06
 
 - Automatic response parsing.

data/lib/mediawiki_api/client.rb

@@ -146,7 +146,9 @@ module MediawikiApi
       unless @tokens.include?(type)
         response = action(:tokens, type: type, http_method: :get, token_type: false)
 
-        raise TokenError, response.warnings.join(", ") if response.warnings?
+        if response.warnings? && response.warnings.grep(/Unrecognized value for parameter 'type'/).any?
+          raise TokenError, response.warnings.join(", ")
+        end
 
         @tokens[type] = response.data["#{type}token"]
       end

data/lib/mediawiki_api/version.rb

@@ -1,3 +1,3 @@
 module MediawikiApi
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/client_spec.rb

@@ -15,14 +15,17 @@ describe MediawikiApi::Client do
     subject { client.action(action, params) }
 
     let(:action) { "something" }
+    let(:token_type) { action }
     let(:params) { {} }
 
     let(:response) { { headers: response_headers, body: response_body.to_json } }
     let(:response_headers) { nil }
     let(:response_body) { { "something" => {} } }
 
+    let(:token_warning) { nil }
+
     before do
-      @token_request = stub_token_request(action)
+      @token_request = stub_token_request(token_type, token_warning)
       @request = stub_api_request(:post, action: action, token: mock_token).to_return(response)
     end
 
@@ -105,6 +108,24 @@ describe MediawikiApi::Client do
         expect { subject }.to raise_error(MediawikiApi::ApiError, "detailed message (code)")
       end
     end
+
+    context "given a bad token type" do
+      let(:params) { { token_type: token_type } }
+      let(:token_type) { "badtoken" }
+      let(:token_warning) { "Unrecognized value for parameter 'type': badtoken" }
+
+      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." }
+
+      it "raises no exception" do
+        expect { subject }.to_not raise_error
+      end
+    end
   end
 
   describe "#log_in" do

data/spec/support/request_helpers.rb

@@ -22,8 +22,11 @@ module MediawikiApi::RequestHelpers
     stub_api_request(method, params.merge(action: action, token: mock_token))
   end
 
-  def stub_token_request(type)
+  def stub_token_request(type, warning = nil)
+    response = { tokens: { "#{type}token" => mock_token } }
+    response[:warnings] = { type => { "*" => [warning] } } unless warning.nil?
+
     stub_api_request(:get, action: "tokens", type: type).
-      to_return(body: { tokens: { "#{type}token" => mock_token } }.to_json)
+      to_return(body: response.to_json)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mediawiki_api
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Amir Aharoni
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday