extracted accessor methods into module that is scope because polluting Module or Class is just not cool

2 files changed, 26 insertions, 18 deletions

diff --git a/lib/axlsx/util/accessors.rb b/lib/axlsx/util/accessors.rb
new file mode 100644
index 00000000..3096d9c7
--- /dev/null
+++ b/lib/axlsx/util/accessors.rb
@@ -0,0 +1,26 @@
+module Axlsx
+  module Accessors
+    def self.included(base)
+      base.send :extend, ClassMethods
+    end
+
+    module ClassMethods
+      def string_attr_accessor(*symbols)
+        validated_attr_accessor(symbols, 'validate_string')
+      end
+
+      def boolean_attr_accessor(*symbols)
+        validated_attr_accessor(symbols, 'validate_boolean')
+      end
+
+      SETTER = "def %s=(value) Axlsx::%s(value); @%s = value; end"
+      def validated_attr_accessor(symbols, validator)
+        symbols.each do |symbol|
+          attr_reader symbol
+          module_eval(SETTER % [symbol.to_s, validator, symbol.to_s], __FILE__, __LINE__)
+        end
+      end
+    end
+  end
+end
+
diff --git a/lib/axlsx/util/module.rb b/lib/axlsx/util/module.rb
deleted file mode 100644
index 4f3543a0..00000000
--- a/lib/axlsx/util/module.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-class Module
-  def string_attr_accessor(*symbols)
-    validated_attr_accessor(symbols, 'validate_string')
-  end
-
-  def boolean_attr_accessor(*symbols)
-    validated_attr_accessor(symbols, 'validate_boolean')
-  end
-
-  SETTER = "def %s=(value) Axlsx::%s(value); @%s = value; end"
-  def validated_attr_accessor(symbols, validator)
-    symbols.each do |symbol|
-      attr_reader symbol
-      module_eval(SETTER % [symbol.to_s, validator, symbol.to_s], __FILE__, __LINE__)
-    end
-  end
-
-end