Lint updates (#2)

* Lint updates

* Bump version back down and pin dependencies

* Pin transitive dependency to fix 1.9.3 breakage

Author: Will Myers

Gemfile

@@ -3,7 +3,8 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'rake'
-  gem 'test-unit'
-  gem 'webmock'
+  gem 'rake', '10.4.2'
+  gem 'test-unit', '3.1.5'
+  gem 'addressable', '2.4.0'
+  gem 'webmock', '2.1.0'
 end

Rakefile

@@ -1,6 +1,6 @@
 require 'rake/testtask'
 
-task :default => [:test]
+task(default: [:test])
 
 Rake::TestTask.new do |t|
   t.pattern = './test/**/*_test.rb'

bin/console

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require "irb"
+require 'irb'
 require "#{File.expand_path('../../lib', __FILE__)}/button.rb"
 
 IRB.start

button.gemspec

@@ -3,13 +3,16 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'button'
 
+description = 'Button is a contextual acquisition channel and closed-loop '\
+  'attribution and affiliation system for mobile commerce.'
+
 Gem::Specification.new do |spec|
   spec.name = 'button'
   spec.version = Button::VERSION
   spec.authors = ['Button']
   spec.email = ['support@usebutton.com']
   spec.summary = 'ruby client for the Button Order API'
-  spec.description = 'Button is a contextual acquisition channel and closed-loop attribution and affiliation system for mobile commerce.'
+  spec.description = description
   spec.homepage = 'https://usebutton.com'
 
   spec.files = Dir.glob('lib/**/*') + ['LICENSE', 'README.md', 'CHANGELOG.md']

lib/button/client.rb

@@ -1,6 +1,9 @@
 require 'button/resources/orders'
 require 'button/errors'
 
+NO_API_KEY_MESSAGE = 'Must provide a Button API key.  Find yours at '\
+  'https://app.usebutton.com/settings/organization'
+
 module Button
   # Client is the top-level interface for the Button API.  It exposes one
   # resource currently: `.orders`.  It requires a valid API key to make
@@ -15,7 +18,7 @@ module Button
   class Client
     def initialize(api_key)
       if api_key.nil? || api_key.empty?
-        raise ButtonClientError, 'Must provide a Button API key.  Find yours at https://app.usebutton.com/settings/organization'
+        raise ButtonClientError, NO_API_KEY_MESSAGE
       end
 
       @orders = Orders.new(api_key)

test/button/resources/orders_test.rb

@@ -7,35 +7,35 @@ def teardown
 
   def test_get
     stub_request(:get, 'https://api.usebutton.com/v1/order/btnorder-XXX')
-      .with(:headers => { 'Authorization' => 'Basic c2stWFhYOg==' })
-      .to_return(:status => 200, :body => '{ "meta": { "status": "ok" }, "object": { "a": 1 } }')
+      .with(headers: { Authorization: 'Basic c2stWFhYOg==' })
+      .to_return(status: 200, body: '{ "meta": { "status": "ok" }, "object": { "a": 1 } }')
 
     response = Button::Orders.new('sk-XXX').get('btnorder-XXX')
     assert_equal(response.a, 1)
   end
 
   def test_create
     stub_request(:post, 'https://api.usebutton.com/v1/order')
-      .with(:body => '{"a":1}', :headers => { 'Authorization' => 'Basic c2stWFhYOg==' })
-      .to_return(:status => 200, :body => '{ "meta": { "status": "ok" }, "object": { "a": 1 } }')
+      .with(body: '{"a":1}', headers: { Authorization: 'Basic c2stWFhYOg==' })
+      .to_return(status: 200, body: '{ "meta": { "status": "ok" }, "object": { "a": 1 } }')
 
     response = Button::Orders.new('sk-XXX').create(a: 1)
     assert_equal(response.a, 1)
   end
 
   def test_update
     stub_request(:post, 'https://api.usebutton.com/v1/order/btnorder-XXX')
-      .with(:body => '{"a":1}', :headers => { 'Authorization' => 'Basic c2stWFhYOg==' })
-      .to_return(:status => 200, :body => '{ "meta": { "status": "ok" }, "object": { "a": 1 } }')
+      .with(body: '{"a":1}', headers: { Authorization: 'Basic c2stWFhYOg==' })
+      .to_return(status: 200, body: '{ "meta": { "status": "ok" }, "object": { "a": 1 } }')
 
     response = Button::Orders.new('sk-XXX').update('btnorder-XXX', a: 1)
     assert_equal(response.a, 1)
   end
 
   def test_delete
     stub_request(:delete, 'https://api.usebutton.com/v1/order/btnorder-XXX')
-      .with(:headers => { 'Authorization' => 'Basic c2stWFhYOg==' })
-      .to_return(:status => 200, :body => '{ "meta": { "status": "ok" }, "object": null }')
+      .with(headers: { Authorization: 'Basic c2stWFhYOg==' })
+      .to_return(status: 200, body: '{ "meta": { "status": "ok" }, "object": null }')
 
     response = Button::Orders.new('sk-XXX').delete('btnorder-XXX')
     assert_equal(response.to_hash, {})

test/button/resources/resource_test.rb

@@ -7,7 +7,7 @@ def teardown
 
   def test_raises_with_empty_response
     stub_request(:get, 'https://api.usebutton.com/v1/bloop')
-      .to_return(:status => 200, :body => '')
+      .to_return(status: 200, body: '')
 
     assert_raises(Button::ButtonClientError) do
       Button::Resource.new('sk-XXX').api_get('/v1/bloop')
@@ -16,7 +16,7 @@ def test_raises_with_empty_response
 
   def test_raises_with_nil_response
     stub_request(:get, 'https://api.usebutton.com/v1/bloop')
-      .to_return(:status => 200, :body => nil)
+      .to_return(status: 200, body: nil)
 
     assert_raises(Button::ButtonClientError) do
       Button::Resource.new('sk-XXX').api_get('/v1/bloop')
@@ -25,7 +25,7 @@ def test_raises_with_nil_response
 
   def test_raises_with_invalid_json_response
     stub_request(:get, 'https://api.usebutton.com/v1/bloop')
-      .to_return(:status => 200, :body => 'invalid json')
+      .to_return(status: 200, body: 'invalid json')
 
     assert_raises(Button::ButtonClientError) do
       Button::Resource.new('sk-XXX').api_get('/v1/bloop')
@@ -34,7 +34,7 @@ def test_raises_with_invalid_json_response
 
   def test_raises_with_a_server_error
     stub_request(:get, 'https://api.usebutton.com/v1/bloop')
-      .to_return(:status => 404, :body => '{ "meta": { "status": "error" }, "error": { "message": "bloop" } }')
+      .to_return(status: 404, body: '{ "meta": { "status": "error" }, "error": { "message": "bloop" } }')
 
     assert_raises(Button::ButtonClientError.new('bloop')) do
       Button::Resource.new('sk-XXX').api_get('/v1/bloop')
@@ -43,7 +43,7 @@ def test_raises_with_a_server_error
 
   def test_raises_with_an_unknown_status_error
     stub_request(:get, 'https://api.usebutton.com/v1/bloop')
-      .to_return(:status => 404, :body => '{ "meta": { "status": "wat" }, "error": { "message": "bloop" } }')
+      .to_return(status: 404, body: '{ "meta": { "status": "wat" }, "error": { "message": "bloop" } }')
 
     assert_raises(Button::ButtonClientError.new('Unknown status: wat')) do
       Button::Resource.new('sk-XXX').api_get('/v1/bloop')
@@ -52,7 +52,7 @@ def test_raises_with_an_unknown_status_error
 
   def test_raises_if_receives_unknown_error_response
     stub_request(:get, 'https://api.usebutton.com/v1/bloop')
-      .to_return(:status => 404, :body => '{}')
+      .to_return(status: 404, body: '{}')
 
     assert_raises(Button::ButtonClientError) do
       Button::Resource.new('sk-XXX').api_get('/v1/bloop')
@@ -61,7 +61,7 @@ def test_raises_if_receives_unknown_error_response
     WebMock.reset!
 
     stub_request(:get, 'https://api.usebutton.com/v1/bloop')
-      .to_return(:status => 404, :body => '{ "meta": "wat" }')
+      .to_return(status: 404, body: '{ "meta": "wat" }')
 
     assert_raises(Button::ButtonClientError) do
       Button::Resource.new('sk-XXX').api_get('/v1/bloop')
@@ -70,7 +70,7 @@ def test_raises_if_receives_unknown_error_response
     WebMock.reset!
 
     stub_request(:get, 'https://api.usebutton.com/v1/bloop')
-      .to_return(:status => 404, :body => '{ "meta": { "status": "error" }, "error": "wat" }')
+      .to_return(status: 404, body: '{ "meta": { "status": "error" }, "error": "wat" }')
 
     assert_raises(Button::ButtonClientError) do
       Button::Resource.new('sk-XXX').api_get('/v1/bloop')
@@ -81,24 +81,24 @@ def test_raises_if_receives_unknown_error_response
 
   def test_gets_a_resource
     stub_request(:get, 'https://api.usebutton.com/v1/bloop')
-      .to_return(:status => 200, :body => '{ "meta": { "status": "ok" }, "object": { "a": 1 } }')
+      .to_return(status: 200, body: '{ "meta": { "status": "ok" }, "object": { "a": 1 } }')
 
     response = Button::Resource.new('sk-XXX').api_get('/v1/bloop')
     assert_equal(response.a, 1)
   end
 
   def test_posts_a_resource
     stub_request(:post, 'https://api.usebutton.com/v1/bloop')
-      .with(:body => '{"a":1}')
-      .to_return(:status => 200, :body => '{ "meta": { "status": "ok" }, "object": { "a": 1 } }')
+      .with(body: '{"a":1}')
+      .to_return(status: 200, body: '{ "meta": { "status": "ok" }, "object": { "a": 1 } }')
 
     response = Button::Resource.new('sk-XXX').api_post('/v1/bloop', a: 1)
     assert_equal(response.a, 1)
   end
 
   def test_deletes_a_resource
     stub_request(:delete, 'https://api.usebutton.com/v1/bloop/1')
-      .to_return(:status => 200, :body => '{ "meta": { "status": "ok" }, "object": null }')
+      .to_return(status: 200, body: '{ "meta": { "status": "ok" }, "object": null }')
 
     response = Button::Resource.new('sk-XXX').api_delete('/v1/bloop/1')
     assert_equal(response.to_hash, {})

test/button/response_test.rb

@@ -12,7 +12,7 @@ def test_method_lookups
   end
 
   def test_to_hash
-    hash = { :a => 1, :b => 'two' }
+    hash = { a: 1, b: 'two' }
     response = Button::Response.new(hash)
     assert_equal(response.to_hash, a: 1, b: 'two')
   end