Skip to content

Commit 20a7dd2

Browse files
authored
Merge pull request #39 from B-CDD/chore/remove-singleton-stdlib
Remove usage of singleton (stdlib)
2 parents 64bab97 + ac39b10 commit 20a7dd2

File tree

7 files changed

+10
-11
lines changed

7 files changed

+10
-11
lines changed

Steepfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ target :lib do
1010
# check 'app/models/**/*.rb' # Glob
1111
# ignore 'lib/templates/*.rb'
1212

13-
library 'singleton' # Standard libraries
13+
# library 'singleton' # Standard libraries
1414
# library 'strong_json' # Gems
1515

1616
# configure_code_diagnostics(D::Ruby.default) # `default` diagnostics setting (applies by default)

lib/bcdd/result.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# frozen_string_literal: true
22

33
require 'set'
4-
require 'singleton'
54

65
module BCDD
76
require_relative 'success'

lib/bcdd/result/config.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99

1010
class BCDD::Result
1111
class Config
12-
include ::Singleton
13-
1412
attr_reader :addon, :feature, :constant_alias, :pattern_matching
1513

1614
def initialize
@@ -58,5 +56,9 @@ def inspect
5856
"options=#{options.keys.sort.inspect} " \
5957
"and_then!=#{and_then!.options.inspect}>"
6058
end
59+
60+
@instance = new
61+
62+
singleton_class.send(:attr_reader, :instance)
6163
end
6264
end

lib/bcdd/result/transitions/config.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
module BCDD::Result::Transitions
44
class Config
5-
include ::Singleton
6-
75
attr_reader :listener, :trace_id
86

97
def initialize
@@ -22,5 +20,9 @@ def trace_id=(arg)
2220

2321
@trace_id = arg
2422
end
23+
24+
@instance = new
25+
26+
singleton_class.send(:attr_reader, :instance)
2527
end
2628
end

sig/bcdd/result/config.rbs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
class BCDD::Result::Config
2-
include Singleton
3-
42
ADDON: Hash[Symbol, Hash[Symbol, untyped]]
53
FEATURE: Hash[Symbol, Hash[Symbol, untyped]]
64
PATTERN_MATCHING: Hash[Symbol, Hash[Symbol, untyped]]

sig/bcdd/result/transitions.rbs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ class BCDD::Result
6464
end
6565

6666
class Config
67-
include ::Singleton
68-
6967
attr_reader listener: untyped
7068
attr_reader trace_id: ::Proc
7169

test/bcdd/result/config_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
class BCDD::Result::Config
66
class Test < Minitest::Test
77
test '.instance' do
8-
assert BCDD::Result::Config.instance.is_a?(Singleton)
8+
assert BCDD::Result::Config.instance.is_a?(BCDD::Result::Config)
99

1010
assert_same(BCDD::Result::Config.instance, BCDD::Result.config)
1111
end

0 commit comments

Comments
 (0)