Skip to content

Commit 62b6386

Browse files
arampriceystros
authored andcommitted
Move ruby monkey-patches to bosh/director/core_ext/
Signed-off-by: Brian Upton <brian.upton@broadcom.com>
1 parent 641128f commit 62b6386

File tree

5 files changed

+15
-14
lines changed

5 files changed

+15
-14
lines changed

src/bosh-director/lib/bosh/director.rb

+4-1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ module Director
4040

4141
require 'bosh/version/release_version_list'
4242

43+
require 'bosh/director/core_ext/array'
44+
require 'bosh/director/core_ext/object'
45+
require 'bosh/director/core_ext/hash'
46+
4347
require 'bosh/director/blobstore/errors'
4448
require 'bosh/director/blobstore/client'
4549
require 'bosh/director/blobstore/retryable_client_wrapper'
@@ -67,7 +71,6 @@ module Director
6771
require 'bosh/director/dns/local_dns_manager'
6872
require 'bosh/director/dns/dns_records'
6973
require 'bosh/director/errors'
70-
require 'bosh/director/ext'
7174
require 'bosh/director/ip_util'
7275
require 'bosh/director/ip_addr_or_cidr'
7376
require 'bosh/director/lock_helper'
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
class Array
2+
def to_openstruct
3+
map { |el| el.to_openstruct }
4+
end
5+
end

src/bosh-director/lib/bosh/director/ext.rb src/bosh-director/lib/bosh/director/core_ext/hash.rb

-12
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
class Object
2-
def to_openstruct
3-
self
4-
end
5-
end
6-
7-
class Array
8-
def to_openstruct
9-
map { |el| el.to_openstruct }
10-
end
11-
end
12-
131
class Hash
142
def recursive_merge(other)
153
self.merge(other) do |_, old_value, new_value|
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
class Object
2+
def to_openstruct
3+
self
4+
end
5+
end

src/bosh-director/spec/unit/bosh/director/ext_spec.rb src/bosh-director/spec/unit/bosh/director/core_ext/hash_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require 'spec_helper'
22

3-
describe 'Monkey Patches' do
3+
describe 'Hash Monkey Patches' do
44
describe '#to_openstruct' do
55
it 'should convert a complex object to an openstruct' do
66
hash = {

0 commit comments

Comments
 (0)