Skip to content

Commit be1e509

Browse files
committed
Only require active_support/core_ext/hash/compact is Ruby is < 2.5.
Ruby 2.5+ (required by Rails 6) provides Hash#compact and Hash#compact! natively, so requiring active_support/core_ext/hash/compact is no longer necessary. Requiring it will raise LoadError in Rails 6.1.
1 parent e16a4bc commit be1e509

9 files changed

Lines changed: 2 additions & 12 deletions

File tree

lib/gooddata.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,5 @@ module GoodData
3737

3838
# Helpers
3939
require 'gooddata/helpers/global_helpers'
40+
41+
require 'active_support/core_ext/hash/compact' unless RUBY_VERSION >= '2.5'

lib/gooddata/lcm/actions/base_action.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
require 'gooddata/extensions/string'
99
require 'gooddata/extensions/nil'
1010

11-
require 'active_support/core_ext/hash/compact'
12-
1311
require_relative '../dsl/dsl'
1412
require_relative '../helpers/helpers'
1513
require_relative '../types/types'

lib/gooddata/lcm/lcm2.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
require 'gooddata/extensions/string'
1414
require 'gooddata/extensions/nil'
1515

16-
require 'active_support/core_ext/hash/compact'
17-
1816
require_relative 'actions/actions'
1917
require_relative 'dsl/dsl'
2018
require_relative 'helpers/helpers'

lib/gooddata/lcm/types/base_type.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
require_relative '../dsl/dsl'
99
require_relative '../helpers/helpers'
1010

11-
require 'active_support/core_ext/hash/compact'
12-
1311
require 'gooddata/extensions/class'
1412

1513
module GoodData

lib/gooddata/models/blueprint/project_blueprint.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
# This source code is licensed under the BSD-style license found in the
33
# LICENSE file in the root directory of this source tree.
44

5-
require 'active_support/core_ext/hash/compact'
6-
75
module GoodData
86
module Model
97
class ProjectBlueprint

lib/gooddata/models/domain.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
# LICENSE file in the root directory of this source tree.
66

77
require 'cgi'
8-
require 'active_support/core_ext/hash/compact'
98

109
require_relative 'profile'
1110
require_relative '../extensions/enumerable'

lib/gooddata/models/project.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
require 'net/smtp'
1414

1515
require 'active_support/core_ext/hash/except'
16-
require 'active_support/core_ext/hash/compact'
1716
require 'active_support/core_ext/hash/slice'
1817

1918
require_relative '../exceptions/no_project_error'

lib/gooddata/models/user_filters/user_filter_builder.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
require_relative '../project_log_formatter'
88

99
require 'active_support/core_ext/hash/indifferent_access'
10-
require 'active_support/core_ext/hash/compact'
1110

1211
require 'gooddata/extensions/true'
1312
require 'gooddata/extensions/false'

lib/gooddata/models/user_group.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
require_relative '../mixins/uri_getter'
1414

1515
require 'active_support/core_ext/hash/except'
16-
require 'active_support/core_ext/hash/compact'
1716

1817
module GoodData
1918
# Representation of User Group

0 commit comments

Comments
 (0)