Drop support ruby 1.x, rails 2.x, rails 3.x (#141)

* Remove Rails <4 exceptions

Signed-off-by: Florian Wininger <[email protected]>

* Remove Ruby 1.X exceptions

Signed-off-by: Florian Wininger <[email protected]>

* Rubocop : use ruby19 hash style

Signed-off-by: Florian Wininger <[email protected]>

* Remove GemFiles and Environnement Rails 2.X, Rails 3.X, Ruby 1.X

Signed-off-by: Florian Wininger <[email protected]>

* Use default rubocop configuration

Signed-off-by: Florian Wininger <[email protected]>

* Remove useless assignement

Signed-off-by: Florian Wininger <[email protected]>

Author: fwininger

.rubocop.yml

@@ -12,11 +12,6 @@ Lint/AssignmentInCondition:
   Exclude:
     - 'lib/api_auth/base.rb'
 
-# Offense count: 1
-Lint/UselessAssignment:
-  Exclude:
-    - 'spec/request_drivers/rest_client_spec.rb'
-
 # Offense count: 2
 Metrics/AbcSize:
   Max: 25
@@ -60,42 +55,9 @@ Style/Documentation:
     - 'lib/api_auth/railtie.rb'
     - 'lib/api_auth/request_drivers/rest_client.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
-Style/ExtraSpacing:
-  Exclude:
-    - 'lib/api_auth/railtie.rb'
-
 # Offense count: 1
 # Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts.
 Style/FileName:
   Exclude:
     - 'lib/api-auth.rb'
-
-# Offense count: 110
-# Cop supports --auto-correct.
-# Configuration parameters: SupportedStyles, UseHashRocketsWithSymbolValues.
-# SupportedStyles: ruby19, ruby19_no_mixed_keys, hash_rockets
-Style/HashSyntax:
-  EnforcedStyle: hash_rockets
-
-# Offense count: 4
-# Cop supports --auto-correct.
-# Configuration parameters: PreferredDelimiters.
-Style/PercentLiteralDelimiters:
-  Exclude:
-    - 'api_auth.gemspec'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: use_perl_names, use_english_names
-Style/SpecialGlobalVars:
-  Enabled: false
-
-# Offense count: 4
-# Cop supports --auto-correct.
-Style/UnneededPercentQ:
-  Exclude:
-    - 'api_auth.gemspec'
+    - 'Appraisals'

.travis.yml

@@ -2,16 +2,11 @@ language: ruby
 sudo: false
 cache: bundler
 rvm:
-  - 1.8.7-p374
-  - 1.9.3
   - 2.1.9
-  - 2.2.5
-  - 2.3.1
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
 gemfile:
-  - gemfiles/rails_23.gemfile
-  - gemfiles/rails_30.gemfile
-  - gemfiles/rails_31.gemfile
-  - gemfiles/rails_32.gemfile
   - gemfiles/rails_4.gemfile
   - gemfiles/rails_41.gemfile
   - gemfiles/rails_42.gemfile
@@ -27,42 +22,10 @@ script:
 
 matrix:
   exclude:
-    - rvm: 1.8.7-p374
-      gemfile: gemfiles/rails_4.gemfile
-    - rvm: 1.8.7-p374
-      gemfile: gemfiles/rails_41.gemfile
-    - rvm: 1.8.7-p374
-      gemfile: gemfiles/rails_42.gemfile
-    - rvm: 1.8.7-p374
-      gemfile: gemfiles/rails_5.gemfile
-    - rvm: 1.9.3
-      gemfile: gemfiles/rails_5.gemfile
-    - rvm: 2.1.9
-      gemfile: gemfiles/rails_23.gemfile
-    - rvm: 2.1.9
-      gemfile: gemfiles/rails_30.gemfile
-    - rvm: 2.1.9
-      gemfile: gemfiles/rails_31.gemfile
     - rvm: 2.1.9
       gemfile: gemfiles/rails_5.gemfile
-    - rvm: 2.2.5
-      gemfile: gemfiles/rails_23.gemfile
-    - rvm: 2.2.5
-      gemfile: gemfiles/rails_30.gemfile
-    - rvm: 2.2.5
-      gemfile: gemfiles/rails_31.gemfile
-    - rvm: 2.2.5
-      gemfile: gemfiles/rails_32.gemfile
-    - rvm: 2.3.1
-      gemfile: gemfiles/rails_23.gemfile
-    - rvm: 2.3.1
-      gemfile: gemfiles/rails_30.gemfile
-    - rvm: 2.3.1
-      gemfile: gemfiles/rails_31.gemfile
-    - rvm: 2.3.1
-      gemfile: gemfiles/rails_32.gemfile
   include:
-    - rvm: 2.3.1
+    - rvm: 2.3.3
       gemfile: gemfiles/rails_5.gemfile
       env: TEST_SUITE="rubocop lib/ spec/"
 

Appraisals

@@ -1,49 +1,23 @@
-appraise "rails-42" do
-  gem "actionpack", "~> 4.2.0"
-  gem "activeresource", "~> 4.0.0"
-  gem "activesupport", "~> 4.2.0"
+appraise 'rails-5' do
+  gem 'actionpack', '~> 5.0.2'
+  gem 'activeresource', '~> 5.0.2'
+  gem 'activesupport', '~> 5.0.2'
 end
 
-appraise "rails-41" do
-  gem "actionpack", "~> 4.1.0"
-  gem "activeresource", "~> 4.0.0"
-  gem "activesupport", "~> 4.1.0"
+appraise 'rails-42' do
+  gem 'actionpack', '~> 4.2.0'
+  gem 'activeresource', '~> 4.0.0'
+  gem 'activesupport', '~> 4.2.0'
 end
 
-appraise "rails-4" do
-  gem "actionpack", "~> 4.0.4"
-  gem "activeresource", "~> 4.0.0"
-  gem "activesupport", "~> 4.0.4"
+appraise 'rails-41' do
+  gem 'actionpack', '~> 4.1.0'
+  gem 'activeresource', '~> 4.0.0'
+  gem 'activesupport', '~> 4.1.0'
 end
 
-appraise "rails-32" do
-  gem "actionpack", "~> 3.2.17"
-  gem "activeresource", "~> 3.2.17"
-  gem "activesupport", "~> 3.2.17"
-  gem "httpi", "< 2.3"
-  gem "i18n", "< 0.7.0"
-  gem "rack-cache", "< 1.3"
-end
-
-appraise "rails-31" do
-  gem "actionpack", "~> 3.1.0"
-  gem "activeresource", "~> 3.1.0"
-  gem "activesupport", "~> 3.1.0"
-  gem "httpi", "< 2.3"
-  gem "i18n", "< 0.7.0"
-  gem "rack-cache", "< 1.3"
-end
-
-appraise "rails-30" do
-  gem "actionpack", "~> 3.0.20"
-  gem "activeresource", "~> 3.0.20"
-  gem "activesupport", "~> 3.0.20"
-  gem "httpi", "< 2.3"
-end
-
-appraise "rails-23" do
-  gem "actionpack", "~> 2.3.2"
-  gem "activeresource", "~> 2.3.2"
-  gem "activesupport", "~> 2.3.2"
-  gem "httpi", "< 2.3"
+appraise 'rails-4' do
+  gem 'actionpack', '~> 4.0.4'
+  gem 'activeresource', '~> 4.0.0'
+  gem 'activesupport', '~> 4.0.4'
 end

Gemfile

@@ -1,7 +1,4 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'rake', '< 11.0', :platforms => :ruby_18
-gem 'tins', '< 1.7',  :platforms => :ruby_19 # amatch dependency
-
-gem 'rubocop', :platforms => [:ruby_19, :ruby_20, :ruby_21, :ruby_22, :ruby_23]
+gem 'rubocop', platforms: %i[ruby_20 ruby_21 ruby_22 ruby_23 ruby_24]

README.md

@@ -2,8 +2,6 @@
 
 [![Build Status](https://travis-ci.org/mgomes/api_auth.png?branch=master)](https://travis-ci.org/mgomes/api_auth)
 
-## IMPORTANT: v2.0.0 is backwards incompatible with the default settings of v1.x to address a security vulnerability. See [CHANGELOG.md](/CHANGELOG.md) for security update information.
-
 Logins and passwords are for humans. Communication between applications need to
 be protected through different means.
 
@@ -51,6 +49,14 @@ minutes in order to avoid replay attacks.
 * [HMAC algorithm](http://en.wikipedia.org/wiki/HMAC)
 * [RFC 2104 (HMAC)](http://tools.ietf.org/html/rfc2104)
 
+## Requirement
+
+v3.X require Ruby 2.X and if you use Rails at least Rails 4.0.
+
+For older version of Ruby or Rails, please use ApiAuth v2.X.
+
+**IMPORTANT: v2.0.0 is backwards incompatible with the default settings of v1.x to address a security vulnerability. See [CHANGELOG.md](/CHANGELOG.md) for security update information.**
+
 ## Install
 
 The gem doesn't have any dependencies outside of having a working OpenSSL

Rakefile

@@ -10,4 +10,4 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-task :default => :spec
+task default: :spec

api_auth.gemspec

@@ -1,11 +1,10 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path('../lib', __FILE__)
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
-  s.name = %q{api-auth}
-  s.summary = %q{Simple HMAC authentication for your APIs}
-  s.description = %q{Full HMAC auth implementation for use in your gems and Rails apps.}
-  s.homepage = %q{https://github.com/mgomes/api_auth}
+  s.name = 'api-auth'
+  s.summary = 'Simple HMAC authentication for your APIs'
+  s.description = 'Full HMAC auth implementation for use in your gems and Rails apps.'
+  s.homepage = 'https://github.com/mgomes/api_auth'
   s.version = File.read(File.join(File.dirname(__FILE__), 'VERSION'))
   s.authors = ['Mauricio Gomes']
   s.email = '[email protected]'
@@ -14,14 +13,13 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
   s.add_development_dependency 'amatch'
   s.add_development_dependency 'rspec', '~> 3.4'
-  s.add_development_dependency 'actionpack', '< 5.0', '> 2.3.2'
-  s.add_development_dependency 'activesupport', '< 5.0', '> 2.3.2'
+  s.add_development_dependency 'actionpack', '< 6.0', '> 4.0'
+  s.add_development_dependency 'activesupport', '< 6.0', '> 4.0'
   s.add_development_dependency 'activeresource', '~> 4.0'
   s.add_development_dependency 'rest-client', '~> 1.6.0'
   s.add_development_dependency 'curb', '~> 0.8.1'
   s.add_development_dependency 'httpi'
-  faraday_version = RUBY_VERSION == '1.8.7' ? '< 0.10' : '>= 0.10'
-  s.add_development_dependency 'faraday', faraday_version
+  s.add_development_dependency 'faraday', '>= 0.10'
   s.add_development_dependency 'multipart-post', '~> 2.0'
 
   s.files         = `git ls-files`.split("\n")

gemfiles/rails_23.gemfile

@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "actionpack", "~> 5.0.0"
+gem "actionpack", "~> 5.0.2"
 gem "activeresource", "~> 5.0.0", git: 'https://github.com/rails/activeresource.git'
-gem "activesupport", "~> 5.0.0"
+gem "activesupport", "~> 5.0.2"
 
 gem "rubocop"
 

gemfiles/rails_30.gemfile

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # api-auth is a Ruby gem designed to be used both in your client and server
 # HTTP-based applications. It implements the same authentication methods (HMAC)
 # used by Amazon Web Services.
@@ -21,7 +20,7 @@ class << self
     #
     # secret_key: assigned secret key that is known to both parties
     def sign!(request, access_id, secret_key, options = {})
-      options = { :override_http_method => nil, :digest => 'sha1' }.merge(options)
+      options = { override_http_method: nil, digest: 'sha1' }.merge(options)
       headers = Headers.new(request)
       headers.calculate_md5
       headers.set_date
@@ -33,7 +32,7 @@ def sign!(request, access_id, secret_key, options = {})
     def authentic?(request, secret_key, options = {})
       return false if secret_key.nil?
 
-      options = { :override_http_method => nil }.merge(options)
+      options = { override_http_method: nil }.merge(options)
 
       headers = Headers.new(request)
 
@@ -87,7 +86,7 @@ def signatures_match?(headers, secret_key, options)
       digest = match_data[1].nil? ? 'SHA1' : match_data[1].upcase
       raise InvalidRequestDigest if !options[:digest].nil? && !options[:digest].casecmp(digest).zero?
 
-      options = { :digest => digest }.merge(options)
+      options = { digest: digest }.merge(options)
 
       header_sig = match_data[3]
       calculated_sig = hmac_signature(headers, secret_key, options)

gemfiles/rails_31.gemfile

@@ -1,20 +1,11 @@
 module ApiAuth
   module Helpers # :nodoc:
     def b64_encode(string)
-      if Base64.respond_to?(:strict_encode64)
-        Base64.strict_encode64(string)
-      else
-        # Fall back to stripping out newlines on Ruby 1.8.
-        Base64.encode64(string).delete("\n")
-      end
+      Base64.strict_encode64(string)
     end
 
     def md5_base64digest(string)
-      if Digest::MD5.respond_to?(:base64digest)
-        Digest::MD5.base64digest(string)
-      else
-        b64_encode(Digest::MD5.digest(string))
-      end
+      Digest::MD5.base64digest(string)
     end
 
     # Capitalizes the keys of a hash