From 44076b8b6b0e084d40d13475cc42e09409b05ef5 Mon Sep 17 00:00:00 2001 From: Julien Feltesse Date: Wed, 12 Sep 2018 14:10:56 +0900 Subject: [PATCH] Drop support for ruby < 2.3.0 and update dev dependencies --- .travis.yml | 13 +------------ CHANGELOG.md | 4 +++- Rakefile | 1 - gemfiles/ruby_2.1.gemfile | 5 ----- lib/mauth/version.rb | 2 +- mauth-client.gemspec | 14 ++++++-------- spec/mauth_client_spec.rb | 11 ++++++++--- spec/spec_helper.rb | 1 - 8 files changed, 19 insertions(+), 32 deletions(-) delete mode 100644 gemfiles/ruby_2.1.gemfile diff --git a/.travis.yml b/.travis.yml index ca3df8c..e573c19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,23 +3,12 @@ cache: bundler sudo: false rvm: - - 2.2.10 - 2.3.7 - 2.4.4 - 2.5.1 -matrix: - include: - - rvm: 2.1.10 - gemfile: gemfiles/ruby_2.1.gemfile +script: bundle exec rspec -# https://github.com/travis-ci/travis-ci/issues/8978 -before_install: - - gem update --system - - gem install bundler # https://github.com/travis-ci/travis-ci/issues/9383 - - bundle --version - -script: "bundle exec rspec" deploy: provider: rubygems gem: mauth-client diff --git a/CHANGELOG.md b/CHANGELOG.md index c15a97b..aed93b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,6 @@ -# MAuth-Client History +## v4.1.0 +- Drop support for Ruby < 2.3.0 +- Update development dependencies ## v4.0.4 - Restore original behavior in the proxy of forwarding of headers that begin with HTTP_ (except for HTTP_HOST) but removing the HTTP_. diff --git a/Rakefile b/Rakefile index 8879b44..4c774a2 100644 --- a/Rakefile +++ b/Rakefile @@ -1,6 +1,5 @@ require 'bundler/gem_tasks' require 'rspec/core/rake_task' -require 'kender/tasks' RSpec::Core::RakeTask.new(:spec) diff --git a/gemfiles/ruby_2.1.gemfile b/gemfiles/ruby_2.1.gemfile deleted file mode 100644 index fa37ff2..0000000 --- a/gemfiles/ruby_2.1.gemfile +++ /dev/null @@ -1,5 +0,0 @@ -source "https://rubygems.org" - -gem "rack", "1.6.5" - -gemspec :path => "../" diff --git a/lib/mauth/version.rb b/lib/mauth/version.rb index f62aa89..5a033d4 100644 --- a/lib/mauth/version.rb +++ b/lib/mauth/version.rb @@ -1,3 +1,3 @@ module MAuth - VERSION = '4.0.4'.freeze + VERSION = '4.1.0'.freeze end diff --git a/mauth-client.gemspec b/mauth-client.gemspec index 53af19e..3c99caa 100644 --- a/mauth-client.gemspec +++ b/mauth-client.gemspec @@ -11,7 +11,7 @@ Gem::Specification.new do |spec| spec.description = 'Client for signing and authentication of requests and responses with mAuth authentication. Includes middleware for Rack and Faraday for incoming and outgoing requests and responses.' spec.homepage = 'https://github.com/mdsol/mauth-client-ruby' spec.license = 'MIT' - spec.required_ruby_version = '>= 2.1.0' + spec.required_ruby_version = '>= 2.3.0' spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) } spec.bindir = 'exe' @@ -27,11 +27,9 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'bundler', '~> 1.10' spec.add_development_dependency 'byebug' - spec.add_development_dependency 'kender', '~> 0.4' - spec.add_development_dependency 'rack-test', '~> 0.6.3' - spec.add_development_dependency 'rake', '~> 10.0' - spec.add_development_dependency 'rspec', '~> 3.4' - spec.add_development_dependency 'simplecov', '~> 0.12.0' - spec.add_development_dependency 'timecop', '~> 0.8.1' - spec.add_development_dependency 'uuidtools', '~> 2.1.5' + spec.add_development_dependency 'rack-test', '~> 1.1.0' + spec.add_development_dependency 'rake', '~> 12.0' + spec.add_development_dependency 'rspec', '~> 3.8' + spec.add_development_dependency 'simplecov', '~> 0.16' + spec.add_development_dependency 'timecop', '~> 0.9' end diff --git a/spec/mauth_client_spec.rb b/spec/mauth_client_spec.rb index fdd7f93..a1c4b28 100644 --- a/spec/mauth_client_spec.rb +++ b/spec/mauth_client_spec.rb @@ -1,8 +1,11 @@ require 'spec_helper' require 'faraday' require 'mauth/client' +require 'securerandom' describe MAuth::Client do + let(:app_uuid) { SecureRandom.uuid } + describe '#initialize' do it 'initializes without config' do mc = MAuth::Client.new @@ -91,14 +94,15 @@ def x_mws_authentication describe '#signed' do before { @request = TestSignableRequest.new(:verb => 'PUT', :request_url => '/', :body => 'himom') } + it 'adds X-MWS-Time and X-MWS-Authentication headers when signing' do - mc = MAuth::Client.new(:private_key => OpenSSL::PKey::RSA.generate(2048), :app_uuid => UUIDTools::UUID.random_create.to_s) + mc = MAuth::Client.new(:private_key => OpenSSL::PKey::RSA.generate(2048), :app_uuid => app_uuid) signed_request = mc.signed(@request) expect(signed_request.headers.keys).to include('X-MWS-Authentication') expect(signed_request.headers.keys).to include('X-MWS-Time') end it "can't sign without a private key" do - mc = MAuth::Client.new(:app_uuid => UUIDTools::UUID.random_create.to_s) + mc = MAuth::Client.new(:app_uuid => app_uuid) expect{mc.signed(@request)}.to raise_error(MAuth::UnableToSignError) end it "can't sign without an app uuid" do @@ -106,9 +110,10 @@ def x_mws_authentication expect{mc.signed(@request)}.to raise_error(MAuth::UnableToSignError) end end + describe '#signed_headers' do it 'returns a hash with X-MWS-Time and X-MWS-Authentication headers' do - mc = MAuth::Client.new(:private_key => OpenSSL::PKey::RSA.generate(2048), :app_uuid => UUIDTools::UUID.random_create.to_s) + mc = MAuth::Client.new(:private_key => OpenSSL::PKey::RSA.generate(2048), :app_uuid => app_uuid) signed_headers = mc.signed_headers(TestSignableRequest.new(:verb => 'PUT', :request_url => '/', :body => 'himom')) expect(signed_headers.keys).to include('X-MWS-Authentication') expect(signed_headers.keys).to include('X-MWS-Time') diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index e036dd4..7c74950 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,5 +1,4 @@ require 'timecop' -require 'uuidtools' require 'json' require 'rack/mock'