lib/onix.rb in onix-0.8.3 vs lib/onix.rb in onix-0.8.4

@@ -1,17 +1,18 @@
 # coding: utf-8
 
 require 'bigdecimal'
 require 'cgi'
+require 'singleton'
 require 'roxml'
 require 'andand'
 
 module ONIX
   module Version #:nodoc:
     Major = 0
     Minor = 8
-    Tiny  = 3
+    Tiny  = 4
 
     String = [Major, Minor, Tiny].join('.')
   end
 
   class Formatters
@@ -80,20 +81,13 @@
 require File.join(File.dirname(__FILE__), "onix", "measure")
 require File.join(File.dirname(__FILE__), "onix", "product")
 require File.join(File.dirname(__FILE__), "onix", "reader")
 require File.join(File.dirname(__FILE__), "onix", "writer")
 
-# lists
-require File.join(File.dirname(__FILE__), "onix", "lists", "product_form")
-require File.join(File.dirname(__FILE__), "onix", "lists", "product_availability")
-require File.join(File.dirname(__FILE__), "onix", "lists", "country_code")
-require File.join(File.dirname(__FILE__), "onix", "lists", "language_code")
-require File.join(File.dirname(__FILE__), "onix", "lists", "language_role")
-require File.join(File.dirname(__FILE__), "onix", "lists", "notification_type")
-require File.join(File.dirname(__FILE__), "onix", "lists", "product_form_detail")
-
 # product wrappers
 require File.join(File.dirname(__FILE__), "onix", "simple_product")
 require File.join(File.dirname(__FILE__), "onix", "apa_product")
 
 # misc
+require File.join(File.dirname(__FILE__), "onix", "lists")
 require File.join(File.dirname(__FILE__), "onix", "normaliser")
+require File.join(File.dirname(__FILE__), "onix", "code_list_extractor")