cascading-configuration-setting 1.2.3 → 1.2.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/lib/cascading-configuration-setting.rb +2 -0
  2. data/lib/cascading-configuration-setting/CascadingConfiguration/Setting.rb +17 -52
  3. data/lib/cascading-configuration-setting/CascadingConfiguration/Setting/AccessorDefinitionMethods.rb +0 -1
  4. metadata +3 -3
data/lib/cascading-configuration-setting.rb CHANGED
@@ -1,4 +1,6 @@
1
1
 
2
+ require 'module-cluster'
3
+
2
4
  if $cascading_configuration_development
3
5
  require_relative '../../variable/lib/cascading-configuration-variable.rb'
4
6
  else
data/lib/cascading-configuration-setting/CascadingConfiguration/Setting.rb CHANGED
@@ -1,53 +1,21 @@
1
1
 
2
2
  module CascadingConfiguration::Setting
3
3
 
4
- extend CascadingConfiguration::InternalModuleStub
4
+ extend ModuleCluster
5
5
 
6
+ extend CascadingConfiguration::InternalModuleStub
7
+
6
8
  include CascadingConfiguration::Variable
7
9
 
8
- ##########################
9
- # self.append_features #
10
- ##########################
11
-
12
- def self.append_features( class_or_module )
13
- CascadingConfiguration::Variable.define_accessor_instance_support( class_or_module )
14
- CascadingConfiguration::Variable.define_accessor_module_support( class_or_module )
15
- super
16
- end
17
-
18
- ########################
19
- # self.extend_object #
20
- ########################
21
-
22
- def self.extend_object( class_or_module )
23
- CascadingConfiguration::Variable.define_accessor_module_support( class_or_module )
24
- super
25
- end
26
-
27
- ###################
28
- # self.included #
29
- ###################
30
-
31
- def self.included( class_or_module )
32
- class_or_module.instance_eval do
33
- extend CascadingConfiguration::Setting
34
- extend CascadingConfiguration::Setting::Interface
35
- extend CascadingConfiguration::Setting::AccessorDefinitionMethods
36
- extend CascadingConfiguration::Setting::ModuleInclusionExtensionSupport unless is_a?( Class )
37
- end
38
- end
39
-
40
- ###################
41
- # self.extended #
42
- ###################
43
-
44
- def self.extended( class_or_module )
45
- class_or_module.instance_eval do
46
- extend CascadingConfiguration::Setting::Interface
47
- extend CascadingConfiguration::Setting::AccessorDefinitionMethods
48
- end
49
- end
10
+ include_also_extends( CascadingConfiguration::Setting,
11
+ CascadingConfiguration::Setting::Interface,
12
+ CascadingConfiguration::Setting::AccessorDefinitionMethods )
13
+
14
+ include_cascades_extends_to_module( CascadingConfiguration::Setting::ModuleInclusionExtensionSupport )
50
15
 
16
+ extend_also_extends( CascadingConfiguration::Setting::Interface,
17
+ CascadingConfiguration::Setting::AccessorDefinitionMethods )
18
+
51
19
  ########################################
52
20
  # get_configuration_searching_upward #
53
21
  ########################################
@@ -56,15 +24,12 @@ module CascadingConfiguration::Setting
56
24
 
57
25
  configuration = nil
58
26
 
59
- instance_self = self
60
- accessor_module_support.module_eval do
61
- instance_self.ancestor_configuration_chain.each do |this_ancestor|
62
- if has_configuration_variable?( this_ancestor, configuration_name )
63
- configuration = get_configuration_variable( this_ancestor, configuration_name )
64
- break
65
- end
66
- end
67
- end
27
+ ancestor_configuration_chain.each do |this_ancestor|
28
+ if accessor_module_support.has_configuration_variable?( this_ancestor, configuration_name )
29
+ configuration = accessor_module_support.get_configuration_variable( this_ancestor, configuration_name )
30
+ break
31
+ end
32
+ end
68
33
 
69
34
  return configuration
70
35
 
data/lib/cascading-configuration-setting/CascadingConfiguration/Setting/AccessorDefinitionMethods.rb CHANGED
@@ -25,7 +25,6 @@ module CascadingConfiguration::Setting::AccessorDefinitionMethods
25
25
 
26
26
  def define_cascading_getter( configuration_name )
27
27
  configuration_getter_name = configuration_name
28
- module_self = self
29
28
  [ accessor_instance_support, accessor_module_support ].compact.each do |module_support|
30
29
  module_support.module_eval do
31
30
  define_method( configuration_getter_name ) do
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 1
7
7
  - 2
8
- - 3
9
- version: 1.2.3
8
+ - 4
9
+ version: 1.2.4
10
10
  platform: ruby
11
11
  authors:
12
12
  - Asher
@@ -14,7 +14,7 @@ autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
16
 
17
- date: 2011-07-21 00:00:00 -04:00
17
+ date: 2011-08-01 00:00:00 -04:00
18
18
  default_executable:
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency