Merge pull request #27 from quandl/drop-2.4

Ruan Carlos · web-flow · commit d172b2706212 · 2020-11-02T11:56:57.000-05:00
Drop support for ruby 2.4
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,14 +1,16 @@
 AllCops:
   DisplayCopNames: true
   DisplayStyleGuide: true
+  NewCops: enable
+  TargetRubyVersion: 2.5
 Layout/LineLength:
   Max: 180
+Metrics/MethodLength:
+  Max: 40
 Metrics/AbcSize:
   Enabled: false
 Metrics/CyclomaticComplexity:
   Enabled: false
-Metrics/MethodLength:
-  Max: 40
 Metrics/PerceivedComplexity:
   Enabled: false
 Style/Documentation:
@@ -17,3 +19,5 @@ Style/FrozenStringLiteralComment:
   Enabled: false
 Style/MissingRespondToMissing:
   Enabled: false
+Lint/MissingSuper:
+  Enabled: false
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,10 @@
 sudo: false
 language: ruby
 rvm:
-  - '2.4.1'
-  - '2.5.5'
-  - '2.6.3'
+  - '2.5.0'
+  - '2.5'
+  - '2.6.0'
+  - '2.6'
 
 install:
   - gem install bundler -v '~> 1.17.3'
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+###1.2.0 - 2020-10-29
+
+* Drop support to ruby 2.4 as it reach [EOL](https://www.ruby-lang.org/en/news/2020/04/05/support-of-ruby-2-4-has-ended/).
+
 ###1.1.1 - 2020-07-28
 
 * Update gem dependencies
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    quandl (1.1.1)
+    quandl (1.2.0)
       activesupport (>= 5.2.4.3)
       json (~> 2.3.0)
       rest-client (~> 2.0.2)
@@ -30,18 +30,23 @@ GEM
       domain_name (~> 0.5)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
+    io-console (0.5.6)
+    irb (1.2.7)
+      reline (>= 0.1.5)
     json (2.3.1)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2020.0512)
     minitest (5.14.1)
     netrc (0.11.0)
     parallel (1.19.2)
-    parser (2.7.1.4)
+    parser (2.7.2.0)
       ast (~> 2.4.1)
     public_suffix (4.0.5)
     rainbow (3.0.0)
-    regexp_parser (1.7.1)
+    regexp_parser (1.8.2)
+    reline (0.1.6)
+      io-console (~> 0.5)
     rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
@@ -60,17 +65,17 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
-    rubocop (0.88.0)
+    rubocop (1.1.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8)
       rexml
-      rubocop-ast (>= 0.1.0, < 1.0)
+      rubocop-ast (>= 1.0.1)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.2.0)
-      parser (>= 2.7.0.1)
+    rubocop-ast (1.1.0)
+      parser (>= 2.7.1.5)
     ruby-progressbar (1.10.1)
     safe_yaml (1.0.5)
     thread_safe (0.3.6)
@@ -90,6 +95,7 @@ PLATFORMS
 
 DEPENDENCIES
   factory_girl (~> 4.5.0)
+  irb
   quandl!
   rspec
   rubocop
diff --git a/lib/quandl/connection.rb b/lib/quandl/connection.rb
@@ -8,8 +8,8 @@ def self.request(http_verb, url, options = {}, &block)
       headers = { accept: accept_value, request_source: 'ruby', request_source_version: Quandl::VERSION }.merge(headers)
       headers = { x_api_token: ApiConfig.api_key }.merge(headers) if ApiConfig.api_key
 
-      request_url = ApiConfig.api_base + '/' + url
-      request_url = request_url + '?' + params.to_query if params.present?
+      request_url = "#{ApiConfig.api_base}/#{url}"
+      request_url = "#{request_url}?#{params.to_query}" if params.present?
 
       request_opts = { url: request_url, headers: headers, method: http_verb }
       response = execute_request(request_opts, &block)
diff --git a/lib/quandl/errors/quandl_error.rb b/lib/quandl/errors/quandl_error.rb
@@ -1,13 +1,7 @@
 # based off of stripe gem: https://github.com/stripe/stripe-ruby
 module Quandl
   class QuandlError < StandardError
-    attr_reader :quandl_message
-    attr_reader :http_status
-    attr_reader :http_body
-    attr_reader :http_headers
-    attr_reader :request_id
-    attr_reader :json_body
-    attr_reader :quandl_error_code
+    attr_reader :quandl_message, :http_status, :http_body, :http_headers, :request_id, :json_body, :quandl_error_code
 
     # rubocop:disable Metrics/ParameterLists
     def initialize(quandl_message = nil, http_status = nil, http_body = nil, json_body = nil,
diff --git a/lib/quandl/model/base.rb b/lib/quandl/model/base.rb
@@ -1,7 +1,7 @@
 module Quandl
   class ModelBase
     def initialize(data, _options = {})
-      @raw_data = ActiveSupport::HashWithIndifferentAccess.new(Hash[data.map { |k, v| [Quandl::Util.methodize(k), v] }])
+      @raw_data = ActiveSupport::HashWithIndifferentAccess.new(data.transform_keys { |k| Quandl::Util.methodize(k) })
     end
 
     def data_fields
diff --git a/lib/quandl/model/database.rb b/lib/quandl/model/database.rb
@@ -11,21 +11,20 @@ def bulk_download_url(options = {})
       options.assert_valid_keys(:params)
 
       url = bulk_download_path
-      url = Quandl::ApiConfig.api_base + '/' + url
+      url = "#{Quandl::ApiConfig.api_base}/#{url}"
       url = Quandl::Util.constructed_path(url, id: database_code)
 
       params = options[:params] || {}
       params['api_key'] = Quandl::ApiConfig.api_key if Quandl::ApiConfig.api_key
       params['api_version'] = Quandl::ApiConfig.api_version if Quandl::ApiConfig.api_version
 
-      url += '?' + params.to_query if params.any?
+      url += "?#{params.to_query}" if params.any?
       url
     end
 
     def bulk_download_path
-      path = self.class.default_path + '/data'
-      path = Quandl::Util.constructed_path(path, id: database_code)
-      path
+      path = "#{self.class.default_path}/data"
+      Quandl::Util.constructed_path(path, id: database_code)
     end
 
     def bulk_download_to_file(file_or_folder_path, options = {})
diff --git a/lib/quandl/model/dataset.rb b/lib/quandl/model/dataset.rb
@@ -5,7 +5,7 @@ class Dataset < ModelBase
 
     # rubocop:disable Naming/AccessorMethodName
     def self.get_path
-      default_path + '/metadata'
+      "#{default_path}/metadata"
     end
     # rubocop:enable Naming/AccessorMethodName
 
diff --git a/lib/quandl/model/list.rb b/lib/quandl/model/list.rb
@@ -1,7 +1,6 @@
 module Quandl
   class List
-    attr_reader :meta
-    attr_reader :values
+    attr_reader :meta, :values
 
     def initialize(klass, values, meta)
       @klass = klass
diff --git a/lib/quandl/util.rb b/lib/quandl/util.rb
@@ -10,7 +10,7 @@ def self.convert_to_dates(hash)
       hash.update(hash) do |_k, v|
         if v.is_a?(String) && v =~ /^\d{4}-\d{2}-\d{2}$/ # Date
           Date.parse(v)
-        elsif v.is_a?(String) && v =~ /^\d{4}-\d{2}-\d{2}T[\d:\.]+Z/ # DateTime
+        elsif v.is_a?(String) && v =~ /^\d{4}-\d{2}-\d{2}T[\d:.]+Z/ # DateTime
           Time.parse(v)
         elsif v.is_a?(Array)
           v.map { |ao| convert_to_dates(ao) }
@@ -25,7 +25,7 @@ def self.convert_to_dates(hash)
 
     def self.constructed_path(path, params = {})
       params ||= {}
-      sub_params = Hash[{ id: nil }.merge(params).map { |k, v| [':' + k.to_s, v] }]
+      sub_params = { id: nil }.merge(params).transform_keys { |k| ":#{k}" }
       params.delete_if { |key, _value| path =~ /:#{key}/ }
 
       path = path.dup
diff --git a/lib/quandl/version.rb b/lib/quandl/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Quandl
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end
diff --git a/quandl.gemspec b/quandl.gemspec
@@ -1,12 +1,14 @@
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
 require 'quandl/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'quandl'
   spec.version       = Quandl::VERSION
-  spec.authors       = ['Clement Leung', 'Matthew Basset']
-  spec.email         = ['dev@quandl.com']
+  spec.author        = 'Quandl'
+  spec.email         = 'dev@quandl.com'
+  spec.required_ruby_version = '>= 2.5'
 
   spec.summary       = 'An ORM interface into the quandl api.'
   spec.description   = 'A ruby implementation of the quandl client to be used as an ORM for quandl\'s restful APIs.'
@@ -23,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'rest-client', '~> 2.0.2'
 
   spec.add_development_dependency 'factory_girl', '~> 4.5.0'
+  spec.add_development_dependency 'irb'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'webmock', '~> 3.0.1'
diff --git a/spec/lib/api_config_spec.rb b/spec/lib/api_config_spec.rb
@@ -21,10 +21,8 @@
       end
 
       it 'should be nil if a default is not set' do
-        1.times do
-          threads << Thread.new do
-            expect(Quandl::ApiConfig.api_key).to be_nil
-          end
+        threads << Thread.new do
+          expect(Quandl::ApiConfig.api_key).to be_nil
         end
 
         threads.map(&:join)
