Merge pull request #1715 from andrehjr/allow-rails-6-1

Allow gooddata-ruby to be used with Rails 6.1

Reviewed-by: https://github.com/sangtm

Author: gdgate

gooddata.gemspec

@@ -55,7 +55,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'sqlite3' if RUBY_PLATFORM != 'java'
 
   if RUBY_VERSION >= '2.5'
-    s.add_dependency 'activesupport', '>= 6.0.3.1', '< 6.1'
+    s.add_dependency 'activesupport', '>= 6.0.3.1', '< 6.2'
   else
     s.add_dependency 'activesupport', '>= 5.2.4.3', '< 6.0'
   end

lib/gooddata.rb

@@ -37,3 +37,5 @@ module GoodData
 
 # Helpers
 require 'gooddata/helpers/global_helpers'
+
+require 'active_support/core_ext/hash/compact' unless RUBY_VERSION >= '2.5'

lib/gooddata/lcm/actions/base_action.rb

@@ -8,8 +8,6 @@
 require 'gooddata/extensions/string'
 require 'gooddata/extensions/nil'
 
-require 'active_support/core_ext/hash/compact'
-
 require_relative '../dsl/dsl'
 require_relative '../helpers/helpers'
 require_relative '../types/types'

lib/gooddata/lcm/lcm2.rb

@@ -13,8 +13,6 @@
 require 'gooddata/extensions/string'
 require 'gooddata/extensions/nil'
 
-require 'active_support/core_ext/hash/compact'
-
 require_relative 'actions/actions'
 require_relative 'dsl/dsl'
 require_relative 'helpers/helpers'

lib/gooddata/lcm/types/base_type.rb

@@ -8,8 +8,6 @@
 require_relative '../dsl/dsl'
 require_relative '../helpers/helpers'
 
-require 'active_support/core_ext/hash/compact'
-
 require 'gooddata/extensions/class'
 
 module GoodData

lib/gooddata/models/blueprint/project_blueprint.rb

@@ -2,8 +2,6 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
-require 'active_support/core_ext/hash/compact'
-
 module GoodData
   module Model
     class ProjectBlueprint

lib/gooddata/models/domain.rb

@@ -5,7 +5,6 @@
 # LICENSE file in the root directory of this source tree.
 
 require 'cgi'
-require 'active_support/core_ext/hash/compact'
 
 require_relative 'profile'
 require_relative '../extensions/enumerable'

lib/gooddata/models/project.rb

@@ -13,7 +13,6 @@
 require 'net/smtp'
 
 require 'active_support/core_ext/hash/except'
-require 'active_support/core_ext/hash/compact'
 require 'active_support/core_ext/hash/slice'
 
 require_relative '../exceptions/no_project_error'

lib/gooddata/models/user_filters/user_filter_builder.rb

@@ -7,7 +7,6 @@
 require_relative '../project_log_formatter'
 
 require 'active_support/core_ext/hash/indifferent_access'
-require 'active_support/core_ext/hash/compact'
 
 require 'gooddata/extensions/true'
 require 'gooddata/extensions/false'

lib/gooddata/models/user_group.rb

@@ -13,7 +13,6 @@
 require_relative '../mixins/uri_getter'
 
 require 'active_support/core_ext/hash/except'
-require 'active_support/core_ext/hash/compact'
 
 module GoodData
   # Representation of User Group