Changed ElementBase from Superclass to mixin

Author: Timo Sand

lib/netvisor/element_base.rb

@@ -1,7 +1,11 @@
-class ElementBase
-  def initialize(args = {})
-    args.each_pair do |key, val|
-      self.send("#{key}=", val) if ElementBase.method_defined? key
+module ElementBase
+  def self.included(base)
+    base.class_exec do
+      def initialize(args = {})
+        args.each_pair do |key, val|
+          self.send("#{key}=", val) if ElementBase.method_defined? key
+        end
+      end
     end
   end
 end

lib/netvisor/sales_invoice.rb

@@ -10,57 +10,65 @@ class SalesInvoice
 
       tag self.name.split('::').last
 
-      class InvoiceDate < ElementBase
+      class InvoiceDate
         include HappyMapper
+        include ElementBase
 
         attribute :format, String
         content :value, Date
       end
 
-      class InvoiceAmount < ElementBase
+      class InvoiceAmount
         include HappyMapper
+        include ElementBase
 
         attribute :iso4217currencycode, String
         attribute :currencyrate, Float
         content :amount, Float
       end
 
-      class SellerId < ElementBase
+      class SellerId
         include HappyMapper
+        include ElementBase
 
         attribute :type, String
         content :id, String
       end
 
-      class InvoiceStatus < ElementBase
+      class InvoiceStatus
+        include ElementBase
         include HappyMapper
 
         attribute :type, String
         content :status, String
       end
 
-      class CustomerId < ElementBase
+      class CustomerId
+        include ElementBase
         include HappyMapper
 
         attribute :type, String
         content :id, String
       end
 
-      class CountryCode < ElementBase
+      class CountryCode
+        include ElementBase
         include HappyMapper
 
         attribute :type, String
         content :country_code, String
       end
 
-      class CashDiscount < ElementBase
+      class CashDiscount
+        include ElementBase
         include HappyMapper
 
         attribute :type, String
         content :discount, Integer
       end
 
-      class DirectDebitLink < ElementBase
+      class DirectDebitLink
+        include ElementBase
         include HappyMapper
 
         attribute :mode, String
@@ -70,12 +78,14 @@ class DirectDebitLink < ElementBase
       class InvoiceVoucherLines
         include HappyMapper
 
-        class VoucherLine < ElementBase
+        class VoucherLine
+          include ElementBase
           include HappyMapper
 
           tag 'VoucherLine'
 
-          class LineSum < ElementBase
+          class LineSum
+            include ElementBase
             include HappyMapper
 
             attribute :type, String
@@ -97,7 +107,8 @@ class LineSum < ElementBase
       class SalesInvoiceAttachments
         include HappyMapper
 
-        class InvoiceAttachment < ElementBase
+        class InvoiceAttachment
+          include ElementBase
           include HappyMapper
 
           tag self.name.split('::').last
@@ -116,10 +127,12 @@ class CustomTags
         include HappyMapper
 
 
-        class CustomTag < ElementBase
+        class CustomTag
+          include ElementBase
           include HappyMapper
 
-          class TagValue < ElementBase
+          class TagValue
+            include ElementBase
             include HappyMapper
 
             attribute :datatype, String
@@ -143,14 +156,16 @@ class SalesInvoiceLines
 
       end
 
-      class ChannelFormat < ElementBase
+      class ChannelFormat
+        include ElementBase
         include HappyMapper
 
         attribute :type, String
         content :format, String
       end
 
-      class SecondName < ElementBase
+      class SecondName
+        include ElementBase
         include HappyMapper
 
         attribute :type, String
@@ -160,7 +175,8 @@ class SecondName < ElementBase
       class InvoiceAccrual
         include HappyMapper
 
-        class AccrualVoucherEntry < ElementBase
+        class AccrualVoucherEntry
+          include ElementBase
           include HappyMapper
 
           element :month, Integer

lib/netvisor/sales_invoice_product_line.rb

@@ -7,13 +7,15 @@ module Netvisor
   class SalesInvoiceProductLine
     include HappyMapper
 
-    class ProductId < ElementBase
+    class ProductId
+      include ElementBase
       include HappyMapper
 
       attribute :type, String
       content :id, String
     end
-    class UnitPrice < ElementBase
+    class UnitPrice
+      include ElementBase
       include HappyMapper
 
       attribute :type, String

lib/netvisor/vat_percentage.rb

@@ -2,7 +2,8 @@
 require 'netvisor/element_base'
 
 module Netvisor
-  class VatPercentage < ElementBase
+  class VatPercentage
+    include ElementBase
     include HappyMapper
 
     attribute :vatcode, String