module-cluster 1.4.0 → 1.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (50) hide show
  1. data/README.md +66 -29
  2. data/README.rdoc +66 -29
  3. data/lib/module-cluster.rb +18 -0
  4. data/lib/module-cluster/ModuleCluster.rb +2 -7
  5. data/lib/module-cluster/ModuleCluster/Define/Block.rb +4 -4
  6. data/lib/module-cluster/ModuleCluster/Define/Block/Class.rb +11 -8
  7. data/lib/module-cluster/ModuleCluster/Define/Block/ClassOrInstance.rb +19 -12
  8. data/lib/module-cluster/ModuleCluster/Define/Block/ClassOrModule.rb +19 -12
  9. data/lib/module-cluster/ModuleCluster/Define/Block/ClassOrModuleOrInstance.rb +19 -12
  10. data/lib/module-cluster/ModuleCluster/Define/Block/Instance.rb +3 -2
  11. data/lib/module-cluster/ModuleCluster/Define/Block/Module.rb +11 -8
  12. data/lib/module-cluster/ModuleCluster/Define/Block/ModuleOrInstance.rb +19 -12
  13. data/lib/module-cluster/ModuleCluster/Define/ClassCluster.rb +39 -46
  14. data/lib/module-cluster/ModuleCluster/Define/ClassOrInstanceCluster.rb +34 -33
  15. data/lib/module-cluster/ModuleCluster/Define/Cluster.rb +31 -42
  16. data/lib/module-cluster/ModuleCluster/Define/ClusterCascades.rb +53 -62
  17. data/lib/module-cluster/ModuleCluster/Define/ClusterCascadesToClass.rb +49 -60
  18. data/lib/module-cluster/ModuleCluster/Define/ClusterCascadesToModule.rb +49 -60
  19. data/lib/module-cluster/ModuleCluster/Define/InstanceCluster.rb +3 -4
  20. data/lib/module-cluster/ModuleCluster/Define/ModuleCluster.rb +39 -46
  21. data/lib/module-cluster/ModuleCluster/Define/ModuleOrClassCluster.rb +55 -54
  22. data/lib/module-cluster/ModuleCluster/Define/ModuleOrInstanceCluster.rb +34 -33
  23. data/lib/module-cluster/_private_/ModuleCluster/CascadeFeatures.rb +4 -4
  24. data/lib/module-cluster/_private_/ModuleCluster/CascadeFeatures/ClusterStack.rb +1 -1
  25. data/lib/module-cluster/_private_/ModuleCluster/CascadeFeatures/PerformCascades.rb +64 -46
  26. data/lib/module-cluster/_private_/ModuleCluster/ClusterStack.rb +7 -5
  27. data/lib/module-cluster/_private_/ModuleCluster/ClusterStack/Block.rb +3 -3
  28. data/lib/module-cluster/_private_/ModuleCluster/ClusterStack/Block/Class.rb +2 -2
  29. data/lib/module-cluster/_private_/ModuleCluster/ClusterStack/Block/Instance.rb +1 -1
  30. data/lib/module-cluster/_private_/ModuleCluster/ClusterStack/Block/Module.rb +2 -2
  31. data/lib/module-cluster/_private_/ModuleCluster/ClusterStack/Block/Set.rb +4 -1
  32. data/lib/module-cluster/_private_/ModuleCluster/ClusterStack/Extends.rb +45 -13
  33. data/lib/module-cluster/_private_/ModuleCluster/ClusterStack/Includes.rb +36 -10
  34. data/lib/module-cluster/_private_/ModuleCluster/ClusterStack/PrependsExtends.rb +47 -15
  35. data/lib/module-cluster/_private_/ModuleCluster/ClusterStack/PrependsIncludes.rb +38 -12
  36. data/lib/module-cluster/_private_/ModuleCluster/ClusterStack/Set.rb +29 -1
  37. data/lib/module-cluster/_private_/ModuleCluster/ExtendForCascade.rb +8 -3
  38. data/spec/ModuleCluster/Define/ClassCluster_spec.rb +18 -18
  39. data/spec/ModuleCluster/Define/ClassOrInstanceCluster_spec.rb +10 -10
  40. data/spec/ModuleCluster/Define/ClusterCascadesToClass_spec.rb +18 -18
  41. data/spec/ModuleCluster/Define/ClusterCascadesToModule_spec.rb +18 -18
  42. data/spec/ModuleCluster/Define/ClusterCascades_spec.rb +18 -18
  43. data/spec/ModuleCluster/Define/Cluster_spec.rb +18 -18
  44. data/spec/ModuleCluster/Define/InstanceCluster_spec.rb +2 -2
  45. data/spec/ModuleCluster/Define/ModuleCluster_spec.rb +18 -18
  46. data/spec/ModuleCluster/Define/ModuleOrClassCluster_spec.rb +18 -18
  47. data/spec/ModuleCluster/Define/ModuleOrInstanceCluster_spec.rb +10 -10
  48. data/spec/ModuleCluster_spec.rb +5 -5
  49. data/spec/_private_/ModuleCluster/CascadeFeatures/PerformCascades_spec.rb +110 -2
  50. metadata +2 -2
data/lib/module-cluster/ModuleCluster/Define/ModuleCluster.rb CHANGED
@@ -2,6 +2,7 @@
2
2
  module ModuleCluster::Define::ModuleCluster
3
3
 
4
4
  include ModuleCluster::CascadeFeatures::ClusterStack
5
+ include ModuleCluster::Suspend::WithoutHooks
5
6
 
6
7
  extend ModuleCluster::ExtendForCascade
7
8
 
@@ -30,8 +31,7 @@ module ModuleCluster::Define::ModuleCluster
30
31
  ##################################
31
32
 
32
33
  def module_include_also_includes( *includes, & runtime_includes_block )
33
- cluster_stack.module_include_includes( ModuleCluster::Define::Cluster, __method__, includes, runtime_includes_block )
34
- return self
34
+ return cluster_stack.module_include_includes( ModuleCluster::Define::Cluster, __method__, includes, runtime_includes_block )
35
35
  end
36
36
 
37
37
  #################################
@@ -39,8 +39,7 @@ module ModuleCluster::Define::ModuleCluster
39
39
  #################################
40
40
 
41
41
  def module_include_also_extends( *extends, & runtime_extends_block )
42
- cluster_stack.module_include_extends( ModuleCluster::Define::Cluster, __method__, extends, runtime_extends_block )
43
- return self
42
+ return cluster_stack.module_include_extends( ModuleCluster::Define::Cluster, __method__, extends, runtime_extends_block )
44
43
  end
45
44
 
46
45
  ##############################################
@@ -48,9 +47,9 @@ module ModuleCluster::Define::ModuleCluster
48
47
  ##############################################
49
48
 
50
49
  def module_include_also_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
51
- module_include_also_includes( *includes_and_extends, & runtime_includes_and_extends_block )
52
- module_include_also_extends( *includes_and_extends, & runtime_includes_and_extends_block )
53
- return self
50
+ include_set = module_include_also_includes( *includes_and_extends, & runtime_includes_and_extends_block )
51
+ extend_set = module_include_also_extends( *includes_and_extends, & runtime_includes_and_extends_block )
52
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
54
53
  end
55
54
 
56
55
  #################################
@@ -58,8 +57,7 @@ module ModuleCluster::Define::ModuleCluster
58
57
  #################################
59
58
 
60
59
  def module_extend_also_includes( *includes, & runtime_includes_block )
61
- cluster_stack.module_extend_includes( ModuleCluster::Define::Cluster, __method__, includes, runtime_includes_block )
62
- return self
60
+ return cluster_stack.module_extend_includes( ModuleCluster::Define::Cluster, __method__, includes, runtime_includes_block )
63
61
  end
64
62
 
65
63
  ################################
@@ -67,8 +65,7 @@ module ModuleCluster::Define::ModuleCluster
67
65
  ################################
68
66
 
69
67
  def module_extend_also_extends( *extends, & runtime_extends_block )
70
- cluster_stack.module_extend_extends( ModuleCluster::Define::Cluster, __method__, extends, runtime_extends_block )
71
- return self
68
+ return cluster_stack.module_extend_extends( ModuleCluster::Define::Cluster, __method__, extends, runtime_extends_block )
72
69
  end
73
70
 
74
71
  #############################################
@@ -76,9 +73,9 @@ module ModuleCluster::Define::ModuleCluster
76
73
  #############################################
77
74
 
78
75
  def module_extend_also_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
79
- module_extend_also_includes( *includes_and_extends, & runtime_includes_and_extends_block )
80
- module_extend_also_extends( *includes_and_extends, & runtime_includes_and_extends_block )
81
- return self
76
+ include_set = module_extend_also_includes( *includes_and_extends, & runtime_includes_and_extends_block )
77
+ extend_set = module_extend_also_extends( *includes_and_extends, & runtime_includes_and_extends_block )
78
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
82
79
  end
83
80
 
84
81
  ######################################
@@ -86,8 +83,7 @@ module ModuleCluster::Define::ModuleCluster
86
83
  ######################################
87
84
 
88
85
  def module_include_prepends_includes( *includes, & runtime_includes_block )
89
- cluster_stack.module_include_prepends_includes( ModuleCluster::Define::Cluster, __method__, includes, runtime_includes_block )
90
- return self
86
+ return cluster_stack.module_include_prepends_includes( ModuleCluster::Define::Cluster, __method__, includes, runtime_includes_block )
91
87
  end
92
88
 
93
89
  #####################################
@@ -95,8 +91,7 @@ module ModuleCluster::Define::ModuleCluster
95
91
  #####################################
96
92
 
97
93
  def module_include_prepends_extends( *extends, & runtime_extends_block )
98
- cluster_stack.module_include_prepends_extends( ModuleCluster::Define::Cluster, __method__, extends, runtime_extends_block )
99
- return self
94
+ return cluster_stack.module_include_prepends_extends( ModuleCluster::Define::Cluster, __method__, extends, runtime_extends_block )
100
95
  end
101
96
 
102
97
  ##################################################
@@ -104,9 +99,9 @@ module ModuleCluster::Define::ModuleCluster
104
99
  ##################################################
105
100
 
106
101
  def module_include_prepends_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
107
- module_include_prepends_includes( *includes_and_extends, & runtime_includes_and_extends_block )
108
- module_include_prepends_extends( *includes_and_extends, & runtime_includes_and_extends_block )
109
- return self
102
+ include_set = module_include_prepends_includes( *includes_and_extends, & runtime_includes_and_extends_block )
103
+ extend_set = module_include_prepends_extends( *includes_and_extends, & runtime_includes_and_extends_block )
104
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
110
105
  end
111
106
 
112
107
  #####################################
@@ -114,8 +109,7 @@ module ModuleCluster::Define::ModuleCluster
114
109
  #####################################
115
110
 
116
111
  def module_extend_prepends_includes( *includes, & runtime_includes_block )
117
- cluster_stack.module_extend_prepends_includes( ModuleCluster::Define::Cluster, __method__, includes, runtime_includes_block )
118
- return self
112
+ return cluster_stack.module_extend_prepends_includes( ModuleCluster::Define::Cluster, __method__, includes, runtime_includes_block )
119
113
  end
120
114
 
121
115
  ####################################
@@ -123,8 +117,7 @@ module ModuleCluster::Define::ModuleCluster
123
117
  ####################################
124
118
 
125
119
  def module_extend_prepends_extends( *extends, & runtime_extends_block )
126
- cluster_stack.module_extend_prepends_extends( ModuleCluster::Define::Cluster, __method__, extends, runtime_extends_block )
127
- return self
120
+ return cluster_stack.module_extend_prepends_extends( ModuleCluster::Define::Cluster, __method__, extends, runtime_extends_block )
128
121
  end
129
122
 
130
123
  #################################################
@@ -132,9 +125,9 @@ module ModuleCluster::Define::ModuleCluster
132
125
  #################################################
133
126
 
134
127
  def module_extend_prepends_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
135
- module_extend_prepends_includes( *includes_and_extends, & runtime_includes_and_extends_block )
136
- module_extend_prepends_extends( *includes_and_extends, & runtime_includes_and_extends_block )
137
- return self
128
+ include_set = module_extend_prepends_includes( *includes_and_extends, & runtime_includes_and_extends_block )
129
+ extend_set = module_extend_prepends_extends( *includes_and_extends, & runtime_includes_and_extends_block )
130
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
138
131
  end
139
132
 
140
133
  ############################################
@@ -142,9 +135,9 @@ module ModuleCluster::Define::ModuleCluster
142
135
  ############################################
143
136
 
144
137
  def module_include_or_extend_also_includes( *includes, & runtime_includes_block )
145
- module_include_also_includes( *includes, & runtime_includes_block )
146
- module_extend_also_includes( *includes, & runtime_includes_block )
147
- return self
138
+ include_set = module_include_also_includes( *includes, & runtime_includes_block )
139
+ extend_set = module_extend_also_includes( *includes, & runtime_includes_block )
140
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
148
141
  end
149
142
 
150
143
  ###########################################
@@ -152,9 +145,9 @@ module ModuleCluster::Define::ModuleCluster
152
145
  ###########################################
153
146
 
154
147
  def module_include_or_extend_also_extends( *extends, & runtime_extends_block )
155
- module_include_also_extends( *extends, & runtime_extends_block )
156
- module_extend_also_extends( *extends, & runtime_extends_block )
157
- return self
148
+ include_set = module_include_also_extends( *extends, & runtime_extends_block )
149
+ extend_set = module_extend_also_extends( *extends, & runtime_extends_block )
150
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
158
151
  end
159
152
 
160
153
  ########################################################
@@ -162,9 +155,9 @@ module ModuleCluster::Define::ModuleCluster
162
155
  ########################################################
163
156
 
164
157
  def module_include_or_extend_also_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
165
- module_include_prepends_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
166
- module_extend_prepends_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
167
- return self
158
+ include_set = module_include_prepends_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
159
+ extend_set = module_extend_prepends_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
160
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
168
161
  end
169
162
 
170
163
  ################################################
@@ -172,9 +165,9 @@ module ModuleCluster::Define::ModuleCluster
172
165
  ################################################
173
166
 
174
167
  def module_include_or_extend_prepends_includes( *includes, & runtime_includes_block )
175
- module_include_prepends_includes( *includes, & runtime_includes_block )
176
- module_extend_prepends_includes( *includes, & runtime_includes_block )
177
- return self
168
+ include_set = module_include_prepends_includes( *includes, & runtime_includes_block )
169
+ extend_set = module_extend_prepends_includes( *includes, & runtime_includes_block )
170
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
178
171
  end
179
172
 
180
173
  ###############################################
@@ -182,9 +175,9 @@ module ModuleCluster::Define::ModuleCluster
182
175
  ###############################################
183
176
 
184
177
  def module_include_or_extend_prepends_extends( *extends, & runtime_extends_block )
185
- module_include_prepends_extends( *extends, & runtime_extends_block )
186
- module_extend_prepends_extends( *extends, & runtime_extends_block )
187
- return self
178
+ include_set = module_include_prepends_extends( *extends, & runtime_extends_block )
179
+ extend_set = module_extend_prepends_extends( *extends, & runtime_extends_block )
180
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
188
181
  end
189
182
 
190
183
  ############################################################
@@ -192,9 +185,9 @@ module ModuleCluster::Define::ModuleCluster
192
185
  ############################################################
193
186
 
194
187
  def module_include_or_extend_prepends_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
195
- module_include_prepends_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
196
- module_extend_prepends_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
197
- return self
188
+ include_set = module_include_prepends_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
189
+ extend_set = module_extend_prepends_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
190
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
198
191
  end
199
192
 
200
193
  end
data/lib/module-cluster/ModuleCluster/Define/ModuleOrClassCluster.rb CHANGED
@@ -2,6 +2,7 @@
2
2
  module ModuleCluster::Define::ModuleOrClassCluster
3
3
 
4
4
  include ModuleCluster::CascadeFeatures::ClusterStack
5
+ include ModuleCluster::Suspend::WithoutHooks
5
6
 
6
7
  extend ModuleCluster::ExtendForCascade
7
8
 
@@ -30,9 +31,9 @@ module ModuleCluster::Define::ModuleOrClassCluster
30
31
  ###########################################
31
32
 
32
33
  def module_or_class_include_also_includes( *includes, & runtime_includes_block )
33
- cluster_stack.module_include_includes( ModuleCluster::Define::ModuleOrClassCluster, __method__, includes, runtime_includes_block )
34
- cluster_stack.class_include_includes( ModuleCluster::Define::ModuleOrClassCluster, __method__, includes, runtime_includes_block )
35
- return self
34
+ include_set = cluster_stack.module_include_includes( ModuleCluster::Define::ModuleOrClassCluster, __method__, includes, runtime_includes_block )
35
+ extend_set = cluster_stack.class_include_includes( ModuleCluster::Define::ModuleOrClassCluster, __method__, includes, runtime_includes_block )
36
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
36
37
  end
37
38
 
38
39
  ##########################################
@@ -40,9 +41,9 @@ module ModuleCluster::Define::ModuleOrClassCluster
40
41
  ##########################################
41
42
 
42
43
  def module_or_class_include_also_extends( *extends, & runtime_extends_block )
43
- cluster_stack.module_include_extends( ModuleCluster::Define::ModuleOrClassCluster, __method__, extends, runtime_extends_block )
44
- cluster_stack.class_include_extends( ModuleCluster::Define::ModuleOrClassCluster, __method__, extends, runtime_extends_block )
45
- return self
44
+ include_set = cluster_stack.module_include_extends( ModuleCluster::Define::ModuleOrClassCluster, __method__, extends, runtime_extends_block )
45
+ extend_set = cluster_stack.class_include_extends( ModuleCluster::Define::ModuleOrClassCluster, __method__, extends, runtime_extends_block )
46
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
46
47
  end
47
48
 
48
49
  #######################################################
@@ -50,9 +51,9 @@ module ModuleCluster::Define::ModuleOrClassCluster
50
51
  #######################################################
51
52
 
52
53
  def module_or_class_include_also_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
53
- cluster_stack.module_include_includes_and_extends( ModuleCluster::Define::ModuleOrClassCluster, __method__, includes_and_extends, runtime_includes_and_extends_block )
54
- cluster_stack.class_include_includes_and_extends( ModuleCluster::Define::ModuleOrClassCluster, __method__, includes_and_extends, runtime_includes_and_extends_block )
55
- return self
54
+ include_set = cluster_stack.module_include_includes_and_extends( ModuleCluster::Define::ModuleOrClassCluster, __method__, includes_and_extends, runtime_includes_and_extends_block )
55
+ extend_set = cluster_stack.class_include_includes_and_extends( ModuleCluster::Define::ModuleOrClassCluster, __method__, includes_and_extends, runtime_includes_and_extends_block )
56
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
56
57
  end
57
58
 
58
59
  ##########################################
@@ -60,9 +61,9 @@ module ModuleCluster::Define::ModuleOrClassCluster
60
61
  ##########################################
61
62
 
62
63
  def module_or_class_extend_also_includes( *includes, & runtime_includes_block )
63
- cluster_stack.module_extend_includes( ModuleCluster::Define::ModuleOrClassCluster, __method__, includes, runtime_includes_block )
64
- cluster_stack.class_extend_includes( ModuleCluster::Define::ModuleOrClassCluster, __method__, includes, runtime_includes_block )
65
- return self
64
+ include_set = cluster_stack.module_extend_includes( ModuleCluster::Define::ModuleOrClassCluster, __method__, includes, runtime_includes_block )
65
+ extend_set = cluster_stack.class_extend_includes( ModuleCluster::Define::ModuleOrClassCluster, __method__, includes, runtime_includes_block )
66
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
66
67
  end
67
68
 
68
69
  #########################################
@@ -70,9 +71,9 @@ module ModuleCluster::Define::ModuleOrClassCluster
70
71
  #########################################
71
72
 
72
73
  def module_or_class_extend_also_extends( *extends, & runtime_extends_block )
73
- cluster_stack.module_extend_extends( ModuleCluster::Define::ModuleOrClassCluster, __method__, extends, runtime_extends_block )
74
- cluster_stack.class_extend_extends( ModuleCluster::Define::ModuleOrClassCluster, __method__, extends, runtime_extends_block )
75
- return self
74
+ include_set = cluster_stack.module_extend_extends( ModuleCluster::Define::ModuleOrClassCluster, __method__, extends, runtime_extends_block )
75
+ extend_set = cluster_stack.class_extend_extends( ModuleCluster::Define::ModuleOrClassCluster, __method__, extends, runtime_extends_block )
76
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
76
77
  end
77
78
 
78
79
  ######################################################
@@ -80,9 +81,9 @@ module ModuleCluster::Define::ModuleOrClassCluster
80
81
  ######################################################
81
82
 
82
83
  def module_or_class_extend_also_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
83
- cluster_stack.module_extend_includes_and_extends( ModuleCluster::Define::ModuleOrClassCluster, __method__, includes_and_extends, runtime_includes_and_extends_block )
84
- cluster_stack.class_extend_includes_and_extends( ModuleCluster::Define::ModuleOrClassCluster, __method__, includes_and_extends, runtime_includes_and_extends_block )
85
- return self
84
+ include_set = cluster_stack.module_extend_includes_and_extends( ModuleCluster::Define::ModuleOrClassCluster, __method__, includes_and_extends, runtime_includes_and_extends_block )
85
+ extend_set = cluster_stack.class_extend_includes_and_extends( ModuleCluster::Define::ModuleOrClassCluster, __method__, includes_and_extends, runtime_includes_and_extends_block )
86
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
86
87
  end
87
88
 
88
89
  ###############################################
@@ -90,9 +91,9 @@ module ModuleCluster::Define::ModuleOrClassCluster
90
91
  ###############################################
91
92
 
92
93
  def module_or_class_include_prepends_includes( *includes, & runtime_includes_block )
93
- cluster_stack.module_include_prepends_includes( ModuleCluster::Define::ModuleOrClassCluster, __method__, includes, runtime_includes_block )
94
- cluster_stack.class_include_prepends_includes( ModuleCluster::Define::ModuleOrClassCluster, __method__, includes, runtime_includes_block )
95
- return self
94
+ include_set = cluster_stack.module_include_prepends_includes( ModuleCluster::Define::ModuleOrClassCluster, __method__, includes, runtime_includes_block )
95
+ extend_set = cluster_stack.class_include_prepends_includes( ModuleCluster::Define::ModuleOrClassCluster, __method__, includes, runtime_includes_block )
96
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
96
97
  end
97
98
 
98
99
  ##############################################
@@ -100,9 +101,9 @@ module ModuleCluster::Define::ModuleOrClassCluster
100
101
  ##############################################
101
102
 
102
103
  def module_or_class_include_prepends_extends( *extends, & runtime_extends_block )
103
- cluster_stack.module_include_prepends_extends( ModuleCluster::Define::ModuleOrClassCluster, __method__, extends, runtime_extends_block )
104
- cluster_stack.class_include_prepends_extends( ModuleCluster::Define::ModuleOrClassCluster, __method__, extends, runtime_extends_block )
105
- return self
104
+ include_set = cluster_stack.module_include_prepends_extends( ModuleCluster::Define::ModuleOrClassCluster, __method__, extends, runtime_extends_block )
105
+ extend_set = cluster_stack.class_include_prepends_extends( ModuleCluster::Define::ModuleOrClassCluster, __method__, extends, runtime_extends_block )
106
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
106
107
  end
107
108
 
108
109
  ###########################################################
@@ -110,9 +111,9 @@ module ModuleCluster::Define::ModuleOrClassCluster
110
111
  ###########################################################
111
112
 
112
113
  def module_or_class_include_prepends_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
113
- cluster_stack.module_include_prepends_includes_and_extends( ModuleCluster::Define::ModuleOrClassCluster, __method__, includes_and_extends, runtime_includes_and_extends_block )
114
- cluster_stack.class_include_prepends_includes_and_extends( ModuleCluster::Define::ModuleOrClassCluster, __method__, includes_and_extends, runtime_includes_and_extends_block )
115
- return self
114
+ include_set = cluster_stack.module_include_prepends_includes_and_extends( ModuleCluster::Define::ModuleOrClassCluster, __method__, includes_and_extends, runtime_includes_and_extends_block )
115
+ extend_set = cluster_stack.class_include_prepends_includes_and_extends( ModuleCluster::Define::ModuleOrClassCluster, __method__, includes_and_extends, runtime_includes_and_extends_block )
116
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
116
117
  end
117
118
 
118
119
  ##############################################
@@ -120,9 +121,9 @@ module ModuleCluster::Define::ModuleOrClassCluster
120
121
  ##############################################
121
122
 
122
123
  def module_or_class_extend_prepends_includes( *includes, & runtime_includes_block )
123
- cluster_stack.module_extend_prepends_includes( ModuleCluster::Define::ModuleOrClassCluster, __method__, includes, runtime_includes_block )
124
- cluster_stack.class_extend_prepends_includes( ModuleCluster::Define::ModuleOrClassCluster, __method__, includes, runtime_includes_block )
125
- return self
124
+ include_set = cluster_stack.module_extend_prepends_includes( ModuleCluster::Define::ModuleOrClassCluster, __method__, includes, runtime_includes_block )
125
+ extend_set = cluster_stack.class_extend_prepends_includes( ModuleCluster::Define::ModuleOrClassCluster, __method__, includes, runtime_includes_block )
126
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
126
127
  end
127
128
 
128
129
  #############################################
@@ -130,9 +131,9 @@ module ModuleCluster::Define::ModuleOrClassCluster
130
131
  #############################################
131
132
 
132
133
  def module_or_class_extend_prepends_extends( *extends, & runtime_extends_block )
133
- cluster_stack.module_extend_prepends_extends( ModuleCluster::Define::ModuleOrClassCluster, __method__, extends, runtime_extends_block )
134
- cluster_stack.class_extend_prepends_extends( ModuleCluster::Define::ModuleOrClassCluster, __method__, extends, runtime_extends_block )
135
- return self
134
+ include_set = cluster_stack.module_extend_prepends_extends( ModuleCluster::Define::ModuleOrClassCluster, __method__, extends, runtime_extends_block )
135
+ extend_set = cluster_stack.class_extend_prepends_extends( ModuleCluster::Define::ModuleOrClassCluster, __method__, extends, runtime_extends_block )
136
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
136
137
  end
137
138
 
138
139
  ##########################################################
@@ -140,9 +141,9 @@ module ModuleCluster::Define::ModuleOrClassCluster
140
141
  ##########################################################
141
142
 
142
143
  def module_or_class_extend_prepends_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
143
- cluster_stack.module_extend_prepends_includes_and_extends( ModuleCluster::Define::ModuleOrClassCluster, __method__, includes_and_extends, runtime_includes_and_extends_block )
144
- cluster_stack.class_extend_prepends_includes_and_extends( ModuleCluster::Define::ModuleOrClassCluster, __method__, includes_and_extends, runtime_includes_and_extends_block )
145
- return self
144
+ include_set = cluster_stack.module_extend_prepends_includes_and_extends( ModuleCluster::Define::ModuleOrClassCluster, __method__, includes_and_extends, runtime_includes_and_extends_block )
145
+ extend_set = cluster_stack.class_extend_prepends_includes_and_extends( ModuleCluster::Define::ModuleOrClassCluster, __method__, includes_and_extends, runtime_includes_and_extends_block )
146
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
146
147
  end
147
148
 
148
149
  #####################################################
@@ -150,9 +151,9 @@ module ModuleCluster::Define::ModuleOrClassCluster
150
151
  #####################################################
151
152
 
152
153
  def module_or_class_include_or_extend_also_includes( *includes, & runtime_includes_block )
153
- module_or_class_include_also_includes( *includes, & runtime_includes_block )
154
- module_or_class_extend_also_includes( *includes, & runtime_includes_block )
155
- return self
154
+ include_set = module_or_class_include_also_includes( *includes, & runtime_includes_block )
155
+ extend_set = module_or_class_extend_also_includes( *includes, & runtime_includes_block )
156
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
156
157
  end
157
158
 
158
159
  ####################################################
@@ -160,9 +161,9 @@ module ModuleCluster::Define::ModuleOrClassCluster
160
161
  ####################################################
161
162
 
162
163
  def module_or_class_include_or_extend_also_extends( *extends, & runtime_extends_block )
163
- module_or_class_include_also_extends( *extends, & runtime_extends_block )
164
- module_or_class_extend_also_extends( *extends, & runtime_extends_block )
165
- return self
164
+ include_set = module_or_class_include_also_extends( *extends, & runtime_extends_block )
165
+ extend_set = module_or_class_extend_also_extends( *extends, & runtime_extends_block )
166
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
166
167
  end
167
168
 
168
169
  #################################################################
@@ -170,9 +171,9 @@ module ModuleCluster::Define::ModuleOrClassCluster
170
171
  #################################################################
171
172
 
172
173
  def module_or_class_include_or_extend_also_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
173
- module_or_class_include_prepends_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
174
- module_or_class_extend_prepends_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
175
- return self
174
+ include_set = module_or_class_include_prepends_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
175
+ extend_set = module_or_class_extend_prepends_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
176
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
176
177
  end
177
178
 
178
179
  #########################################################
@@ -180,9 +181,9 @@ module ModuleCluster::Define::ModuleOrClassCluster
180
181
  #########################################################
181
182
 
182
183
  def module_or_class_include_or_extend_prepends_includes( *includes, & runtime_includes_block )
183
- module_or_class_include_prepends_includes( *includes, & runtime_includes_block )
184
- module_or_class_extend_prepends_includes( *includes, & runtime_includes_block )
185
- return self
184
+ include_set = module_or_class_include_prepends_includes( *includes, & runtime_includes_block )
185
+ extend_set = module_or_class_extend_prepends_includes( *includes, & runtime_includes_block )
186
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
186
187
  end
187
188
 
188
189
  ########################################################
@@ -190,9 +191,9 @@ module ModuleCluster::Define::ModuleOrClassCluster
190
191
  ########################################################
191
192
 
192
193
  def module_or_class_include_or_extend_prepends_extends( *extends, & runtime_extends_block )
193
- module_or_class_include_prepends_extends( *extends, & runtime_extends_block )
194
- module_or_class_extend_prepends_extends( *extends, & runtime_extends_block )
195
- return self
194
+ include_set = module_or_class_include_prepends_extends( *extends, & runtime_extends_block )
195
+ extend_set = module_or_class_extend_prepends_extends( *extends, & runtime_extends_block )
196
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
196
197
  end
197
198
 
198
199
  #####################################################################
@@ -200,9 +201,9 @@ module ModuleCluster::Define::ModuleOrClassCluster
200
201
  #####################################################################
201
202
 
202
203
  def module_or_class_include_or_extend_prepends_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
203
- module_or_class_include_prepends_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
204
- module_or_class_extend_prepends_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
205
- return self
204
+ include_set = module_or_class_include_prepends_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
205
+ extend_set = module_or_class_extend_prepends_includes_and_extends( *includes_and_extends, & runtime_includes_and_extends_block )
206
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
206
207
  end
207
208
 
208
209
  end
data/lib/module-cluster/ModuleCluster/Define/ModuleOrInstanceCluster.rb CHANGED
@@ -2,6 +2,7 @@
2
2
  module ModuleCluster::Define::ModuleOrInstanceCluster
3
3
 
4
4
  include ModuleCluster::CascadeFeatures::ClusterStack
5
+ include ModuleCluster::Suspend::WithoutHooks
5
6
 
6
7
  extend ModuleCluster::ExtendForCascade
7
8
 
@@ -26,10 +27,10 @@ module ModuleCluster::Define::ModuleOrInstanceCluster
26
27
  ##########################################################################
27
28
 
28
29
  def module_include_or_extend_or_instance_extend_also_includes_or_extends( *includes_or_extends, & runtime_includes_or_extends_block )
29
- cluster_stack.module_include_includes( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
30
- cluster_stack.module_extend_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
31
- cluster_stack.instance_extend_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
32
- return self
30
+ include_set = cluster_stack.module_include_includes( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
31
+ extend_set = cluster_stack.module_extend_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
32
+ extend_set_two = cluster_stack.instance_extend_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
33
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
33
34
  end
34
35
 
35
36
  ##############################################################
@@ -37,10 +38,10 @@ module ModuleCluster::Define::ModuleOrInstanceCluster
37
38
  ##############################################################
38
39
 
39
40
  def module_include_or_extend_or_instance_extend_also_extends( *includes_or_extends, & runtime_includes_or_extends_block )
40
- cluster_stack.module_include_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
41
- cluster_stack.module_extend_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
42
- cluster_stack.instance_extend_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
43
- return self
41
+ include_set = cluster_stack.module_include_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
42
+ extend_set = cluster_stack.module_extend_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
43
+ extend_set_two = cluster_stack.instance_extend_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
44
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
44
45
  end
45
46
 
46
47
  ################################################################
@@ -48,9 +49,9 @@ module ModuleCluster::Define::ModuleOrInstanceCluster
48
49
  ################################################################
49
50
 
50
51
  def module_include_or_instance_extend_also_includes_or_extends( *includes_or_extends, & runtime_includes_or_extends_block )
51
- cluster_stack.module_include_includes( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
52
- cluster_stack.instance_extend_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
53
- return self
52
+ include_set = cluster_stack.module_include_includes( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
53
+ extend_set = cluster_stack.instance_extend_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
54
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
54
55
  end
55
56
 
56
57
  ####################################################
@@ -58,9 +59,9 @@ module ModuleCluster::Define::ModuleOrInstanceCluster
58
59
  ####################################################
59
60
 
60
61
  def module_include_or_instance_extend_also_extends( *extends, & runtime_extends_block )
61
- cluster_stack.module_include_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, extends, runtime_extends_block )
62
- cluster_stack.instance_extend_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, extends, runtime_extends_block )
63
- return self
62
+ include_set = cluster_stack.module_include_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, extends, runtime_extends_block )
63
+ extend_set = cluster_stack.instance_extend_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, extends, runtime_extends_block )
64
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
64
65
  end
65
66
 
66
67
  ############################################
@@ -68,9 +69,9 @@ module ModuleCluster::Define::ModuleOrInstanceCluster
68
69
  ############################################
69
70
 
70
71
  def module_or_instance_extend_also_extends( *extends, & runtime_extends_block )
71
- cluster_stack.module_extend_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, extends, runtime_extends_block )
72
- cluster_stack.instance_extend_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, extends, runtime_extends_block )
73
- return self
72
+ include_set = cluster_stack.module_extend_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, extends, runtime_extends_block )
73
+ extend_set = cluster_stack.instance_extend_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, extends, runtime_extends_block )
74
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
74
75
  end
75
76
 
76
77
  ##############################################################################
@@ -78,10 +79,10 @@ module ModuleCluster::Define::ModuleOrInstanceCluster
78
79
  ##############################################################################
79
80
 
80
81
  def module_include_or_extend_or_instance_extend_prepends_includes_or_extends( *includes_or_extends, & runtime_includes_or_extends_block )
81
- cluster_stack.module_include_prepends_includes( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
82
- cluster_stack.module_extend_prepends_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
83
- cluster_stack.instance_extend_prepends_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
84
- return self
82
+ include_set = cluster_stack.module_include_prepends_includes( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
83
+ extend_set = cluster_stack.module_extend_prepends_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
84
+ extend_set_two = cluster_stack.instance_extend_prepends_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
85
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
85
86
  end
86
87
 
87
88
  ####################################################################
@@ -89,9 +90,9 @@ module ModuleCluster::Define::ModuleOrInstanceCluster
89
90
  ####################################################################
90
91
 
91
92
  def module_include_or_instance_extend_prepends_includes_or_extends( *includes_or_extends, & runtime_includes_or_extends_block )
92
- cluster_stack.module_include_prepends_includes( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
93
- cluster_stack.instance_extend_prepends_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
94
- return self
93
+ include_set = cluster_stack.module_include_prepends_includes( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
94
+ extend_set = cluster_stack.instance_extend_prepends_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
95
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
95
96
  end
96
97
 
97
98
  ##################################################################
@@ -99,9 +100,9 @@ module ModuleCluster::Define::ModuleOrInstanceCluster
99
100
  ##################################################################
100
101
 
101
102
  def module_include_or_extend_or_instance_extend_prepends_extends( *includes_or_extends, & runtime_includes_or_extends_block )
102
- cluster_stack.module_include_prepends_includes( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
103
- cluster_stack.instance_extend_prepends_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
104
- return self
103
+ include_set = cluster_stack.module_include_prepends_includes( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
104
+ extend_set = cluster_stack.instance_extend_prepends_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, includes_or_extends, runtime_includes_or_extends_block )
105
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
105
106
  end
106
107
 
107
108
  ########################################################
@@ -109,9 +110,9 @@ module ModuleCluster::Define::ModuleOrInstanceCluster
109
110
  ########################################################
110
111
 
111
112
  def module_include_or_instance_extend_prepends_extends( *extends, & runtime_extends_block )
112
- cluster_stack.module_include_prepends_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, extends, runtime_extends_block )
113
- cluster_stack.instance_extend_prepends_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, extends, runtime_extends_block )
114
- return self
113
+ include_set = cluster_stack.module_include_prepends_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, extends, runtime_extends_block )
114
+ extend_set = cluster_stack.instance_extend_prepends_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, extends, runtime_extends_block )
115
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
115
116
  end
116
117
 
117
118
  ################################################
@@ -119,9 +120,9 @@ module ModuleCluster::Define::ModuleOrInstanceCluster
119
120
  ################################################
120
121
 
121
122
  def module_or_instance_extend_prepends_extends( *extends, & runtime_extends_block )
122
- cluster_stack.module_extend_prepends_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, extends, runtime_extends_block )
123
- cluster_stack.instance_extend_prepends_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, extends, runtime_extends_block )
124
- return self
123
+ include_set = cluster_stack.module_extend_prepends_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, extends, runtime_extends_block )
124
+ extend_set = cluster_stack.instance_extend_prepends_extends( ModuleCluster::Define::ModuleOrInstanceCluster, __method__, extends, runtime_extends_block )
125
+ return ModuleCluster::ClusterStack::Set::MultiSetProxy.new( include_set, extend_set )
125
126
  end
126
127
 
127
128
  end