fix rubocop warnings

QuickPay · Feb 14, 2019 · 98acd39 · 98acd39
1 parent e32aa4e
commit 98acd39
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 19 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in quickpay-ruby-client.gemspec
 gemspec
diff --git a/lib/quickpay/api/error.rb b/lib/quickpay/api/error.rb
@@ -40,12 +40,10 @@ def initialize(status, body, headers)
       end
 
       def self.by_status_code(status, body, headers)
-        if CLASS_MAP[status]
-          klass = QuickPay::API::Error.const_get(CLASS_MAP[status])
-          fail klass.new(status, body, headers)
-        else
-          fail QuickPay::API::Error.new(status, body, headers)
-        end
+        raise QuickPay::API::Error.new(status, body, headers) unless CLASS_MAP[status]
+
+        klass = QuickPay::API::Error.const_get(CLASS_MAP[status])
+        raise klass.new(status, body, headers)
       end
     end
   end

diff --git a/quickpay-ruby-client.gemspec b/quickpay-ruby-client.gemspec
@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "quickpay/api/version"
@@ -19,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake", "~> 12.3.2"
   spec.add_development_dependency "minitest", "~> 5.11.3"
+  spec.add_development_dependency "rake", "~> 12.3.2"
   spec.add_development_dependency "rubocop"
 
   spec.add_dependency "excon", "~> 0.62.0"

diff --git a/test/client.rb b/test/client.rb
@@ -5,17 +5,29 @@
 
 Excon.defaults[:mock] = true
 
+# Excon expects two hashes
+# rubocop:disable Style/BracesAroundHashParameters
+
 describe QuickPay::API::Client do
   before do
-    Excon.stub({}, { body: "Uknown Stub", status: 500})
+    Excon.stub({}, { body: "Uknown Stub", status: 500 })
   end
 
   after do
     Excon.stubs.clear
   end
 
   it "set default headers" do
-    Excon.stub({ path: "/ping" }, lambda { |request_params| { headers: request_params[:headers], :status => 200 } })
+    Excon.stub(
+      { path: "/ping" },
+      lambda do |request_params|
+        {
+          headers: request_params[:headers],
+          status: 200
+        }
+      end
+    )
+
     client = QuickPay::API::Client.new
     _, _, headers = *client.get("/ping", raw: true)
 
@@ -24,7 +36,16 @@
   end
 
   it "handles authentication" do
-    Excon.stub({ path: "/ping" }, lambda { |request_params| { headers: request_params[:headers], :status => 200 } })
+    Excon.stub(
+      { path: "/ping" },
+      lambda do |request_params|
+        {
+          headers: request_params[:headers],
+          status: 200
+        }
+      end
+    )
+
     client = QuickPay::API::Client.new(password: "secret")
     _, _, headers = *client.get("/ping", raw: true)
 
@@ -34,7 +55,17 @@
   it "handles convenient JSON <=> Hash conversion of body" do
     client = QuickPay::API::Client.new
 
-    Excon.stub({ path: "/ping" }, lambda { |request_params| { body: request_params[:body], :status => 200 } })
+    Excon.stub(
+      { path: "/ping" },
+      lambda do |request_params|
+        {
+          body: request_params[:body],
+          status: 200
+        }
+      end
+    )
+
+    # client return JSON string
     client.post(
       "/ping",
       body: { "foo" => "bar" },
@@ -43,13 +74,18 @@
       JSON.parse(response).must_equal({ "foo" => "bar" })
     end
 
-    Excon.stub({ path: "/ping" },
-      lambda { |request_params| { 
-        body: request_params[:body],
-        headers: { "Content-Type" => "application/json" },
-        :status => 200 }
-      }
+    Excon.stub(
+      { path: "/ping" },
+      lambda do |request_params|
+        {
+          body: request_params[:body],
+          headers: { "Content-Type" => "application/json" },
+          status: 200
+        }
+      end
     )
+
+    # client returns Ruby Hash
     client.post(
       "/ping",
       body: { "foo" => "bar" },
@@ -133,3 +169,4 @@
     end
   end
 end
+# rubocop:enable Style/BracesAroundHashParameters