Merge a316509 into d31d6c9

lib/naught/null_class_builder.rb

@@ -42,9 +42,9 @@ def generate_class
       generation_mod    = Module.new
       customization_mod = customization_module # get a local binding
       builder           = self
-      @operations.each do |operation|
-        operation.call(generation_mod)
-      end
+
+      apply_operations(@operations, generation_mod)
+
       null_class = Class.new(@base_class) do
         const_set :GeneratedMethods, generation_mod
         const_set :Customizations, customization_mod
@@ -54,9 +54,9 @@ def generate_class
         include generation_mod
         include customization_mod
       end
-      class_operations.each do |operation|
-        operation.call(null_class)
-      end
+
+      apply_operations(class_operations, null_class)
+
       null_class
     end
 
@@ -161,13 +161,29 @@ def self.get(*)
     end
 
     def define_basic_methods
+      define_basic_instance_methods
+      define_basic_class_methods
+    end
+
+    private
+
+    def apply_operations(operations, module_or_class)
+      operations.each do |operation|
+        operation.call(module_or_class)
+      end
+    end
+
+    def define_basic_instance_methods
       defer do |subject|
         subject.module_exec(@inspect_proc) do |inspect_proc|
           define_method(:inspect, &inspect_proc)
           def initialize(*)
           end
         end
       end
+    end
+
+    def define_basic_class_methods
       defer(class: true) do |subject|
         subject.module_eval do
           class << self
@@ -179,8 +195,6 @@ class << self
       end
     end
 
-    private
-
     def class_operations
       @class_operations ||= []
     end