lib/wise_gopher/base.rb in wise_gopher-0.2.0 vs lib/wise_gopher/base.rb in wise_gopher-0.2.1

@@ -3,17 +3,23 @@
 require "forwardable"
 
 module WiseGopher
   # Main inteface of the gem. Class to be inherited by the query class
   class Base
-    def self.inherited(base)
-      base.class_eval do
-        @raw_params = {}
-        @params     = {}
+    def self.inherited(child_class)
+      parent_class = self
+      child_class.extend ClassMethods
+      child_class.set_defaults
+
+      # if child_class is already a WiseGopher::Base
+      child_class.ancestors.include?(Methods) && child_class.class_eval do
+        @raw_params = parent_class.raw_params.deep_dup
+        @params = parent_class.params.deep_dup
+        @row_class = parent_class.row_class
       end
-      base.include Methods
-      base.extend  ClassMethods
+
+      child_class.include Methods
     end
 
     # class methods for WiseGopher::Base
     module ClassMethods
       attr_reader :row_class, :params, :raw_params
@@ -39,11 +45,11 @@
       end
 
       def row(base = nil, &block)
         @row_class ||= base || define_generic_row_class
 
-        @row_class.include WiseGopher::Row
+        @row_class.include WiseGopher::Row unless @row_class.ancestors.include?(WiseGopher::Row)
 
         @row_class.class_eval(&block) if block_given?
       end
 
       def execute
@@ -60,9 +66,14 @@
 
       def ensure_all_params_are_given(inputs = {})
         missing_params = required_params.keys - inputs.keys.map(&:to_s)
 
         raise WiseGopher::ArgumentError, required_params.slice(*missing_params) if missing_params.any?
+      end
+
+      def set_defaults
+        @raw_params = {}
+        @params = {}
       end
 
       private
 
       def define_generic_row_class