lib/random_data.rb in random_data-1.0.0 vs lib/random_data.rb in random_data-1.0.1

@@ -1,17 +1,16 @@
-require 'singleton'
-Dir['lib/random_data/*.rb'].sort.each { |lib| require lib }
+$:.unshift File.dirname(__FILE__)
+ 
+require 'lib/random_data/array_randomizer'
+require 'lib/random_data/contact_info'
+require 'lib/random_data/dates'
+require 'lib/random_data/locations'
+require 'lib/random_data/names'
+require 'lib/random_data/text'
 
-module RandomData
-  include RandomData::ContactInfo
-  include RandomData::Dates
-  include RandomData::Locations
-  include RandomData::Names
-  include RandomData::Text
-end
-
-# A Singleton class that provides all of RandomData's methods as class methods
-
 class Random
-  include Singleton
-  extend RandomData
+  extend RandomData::ContactInfo
+  extend RandomData::Dates
+  extend RandomData::Locations
+  extend RandomData::Names
+  extend RandomData::Text
 end
\ No newline at end of file