wot_api 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffa449157b0fdfd8d84ca7ada8d0d4a0d4a08fe1
-  data.tar.gz: cb02cf8efa4b49d91af1b5fe6c63ae205f57c95b
+  metadata.gz: 465ca78b685225af5587bfab32cee9ac93555cb5
+  data.tar.gz: 77075ce7dd3a01d805091958041709fbd6f098f8
 SHA512:
-  metadata.gz: d9c4997b0996b74fb6f282f9232a0091676070878eb16e9d864493091a026722b6b91a9754e1b9b68bc075ecfc97f01baa1a9b2242ceffcc88509e0143d9661a
-  data.tar.gz: dcbfbadf8e5594167fb446ec4edbfab2d4fb6be35716c474268286baf94da0dbebc7697ecdb4e4c7a9e9811dcd1ccb016f5e77d17af0c54b9422d33bd1eaff82
+  metadata.gz: 2c1c510ed773ecafef541de6ac8f6db19eaced474f3a0f215b6d51e58a537b70edace9463e4b66e49f34b02f4cbd35e407cc561d982f0b84fbe1b8b3e7a11c39
+  data.tar.gz: 327698d41f512e033d6b0f3c78d4a08986fed8a3aab4686d6594cd0d42b837c06788346dd283abe192a14a159daae1eb47af2c25a1b62d572f0bb68d8a36e09c

data/README.md

@@ -51,6 +51,12 @@ Which wraps the '/wot/account/list' endpoint, with 'search' params and in the :r
 
 Will return an array or hash with the results, or throw an error with a message on a failure.
 
+For endpoints that do not start with '/wot/' you can use a method like such:
+
+    WotApi.wgn_clans_list(search: 'bananas')
+
+to use /wgn/clans/list instead of /wot/clans/list
+
 NOTE: Version 1.2.0 removes the need for all api methods to be called with "WotApi::Base.method", instead can just use "WotApi.method" for less keystrokes. However, the existing methods are still available at WotApi::Base for compatibility. 
 
 ## Clan member resources

data/lib/wot_api/version.rb

@@ -1,3 +1,3 @@
 module WotApi
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/lib/wot_api/wrapper.rb

@@ -28,7 +28,7 @@ module WotApi
       def wot_api_post(method_sym, params)
         params ||= {}
         endpoint = method_to_endpoint(method_sym)
-        region = params.delete(:region).to_sym rescue get_default_region
+        region = !params[:region].nil? ? params.delete(:region).to_sym : get_default_region
         set_base_uri(region)
         begin
           response = merged_post(endpoint, region, params)
@@ -40,7 +40,7 @@ module WotApi
 
       def wot_web_get(endpoint, params)
         params ||= {}
-        region = params.delete(:region).to_sym rescue get_default_region
+        region = !params[:region].nil? ? params.delete(:region).to_sym : get_default_region
         set_base_uri(region, true)
         begin
           return self.get(endpoint, params).parsed_response
@@ -50,13 +50,14 @@ module WotApi
       end
 
       def valid_endpoint?(method_sym)
-        !(method_sym.to_s =~ /^([^_]*)_([^_]*)$/).nil?
+        !(method_sym.to_s =~ /^([^_]+)_([^_]+)$/).nil? || !(method_sym.to_s =~ /^([^_]+)_([^_]+)_([^_]+)$/).nil?
       end
 
       private
 
       def method_to_endpoint(method_sym)
-        "/wot/" + method_sym.to_s.gsub('_','/') + "/"
+        method_sym = ('wot_' + method_sym.to_s).to_sym if method_sym.to_s.count('_') == 1
+        "/" + method_sym.to_s.gsub('_','/') + "/"
       end
 
       def set_base_uri(region, web=false)

data/spec/wot_api_spec.rb

@@ -41,9 +41,19 @@ describe WotApi do
         WotApi.fake_method
       end
 
-      it "calls WotApi::Wrapper.wot_api_post with method symbol and parameters" do
-        expect(WotApi::Wrapper).to receive(:wot_api_post).with(:fake_method, {hi: true})
-        WotApi.fake_method(hi: true)
+      context "with a two-part method name" do
+        it "calls WotApi::Wrapper.wot_api_post with method symbol and parameters" do
+          expect(WotApi::Wrapper).to receive(:wot_api_post).with(:fake_method, {hi: true})
+          WotApi.fake_method(hi: true)
+        end
+      end
+
+      context "with a three-part method name" do
+        it "calls WotApi::Wrapper.wot_api_post with method symbol and parameters" do
+          allow(WotApi::Wrapper).to receive(:valid_endpoint?).with(:quite_fake_method).and_return(true)
+          expect(WotApi::Wrapper).to receive(:wot_api_post).with(:quite_fake_method, {hi: true})
+          WotApi.quite_fake_method(hi: true)
+        end
       end
     end
 

data/spec/wrapper_spec.rb

@@ -30,10 +30,20 @@ describe WotApi::Wrapper do
         FakeWeb.register_uri(:post, "https://api.worldoftanks.com/wot/thing/stuff/", :response => File.join(File.dirname(__FILE__), 'fixtures', "success.json"))
         WotApi.config({'na' => '123456'})
       end
-      it "raises WotApi::ResponseError" do
+      it "returns an array" do
         expect(WotApi::Wrapper.wot_api_post(:thing_stuff, {})).to be_an Array
       end
     end
+
+    context "with a valid endpoint on a different path header" do
+      before(:example) do
+        FakeWeb.register_uri(:post, "https://api.worldoftanks.com/wgn/misc/etc/", :response => File.join(File.dirname(__FILE__), 'fixtures', "success.json"))
+        WotApi.config({'na' => '123456'})
+      end
+      it "returns an array" do
+        expect(WotApi::Wrapper.wot_api_post(:wgn_misc_etc, {})).to be_an Array
+      end
+    end
   end
 
   describe ".wot_web_get" do
@@ -62,6 +72,14 @@ describe WotApi::Wrapper do
     it "returns true for endponts like prefix _underscore_ suffix" do
       expect(WotApi::Wrapper.valid_endpoint?(:test_things)).to eq true
     end
+    it "returns true for three-part endpoints" do
+      expect(WotApi::Wrapper.valid_endpoint?(:what_ever_dude)).to eq true
+    end
+    it "returns false for other stuff" do
+      expect(WotApi::Wrapper.valid_endpoint?(:things)).to eq false
+      expect(WotApi::Wrapper.valid_endpoint?(:stuff_blah_things_and)).to eq false
+      expect(WotApi::Wrapper.valid_endpoint?(:whee_)).to eq false
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wot_api
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Jesse Cantara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2015-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler