lib/j7w1.rb in j7w1-0.0.6 vs lib/j7w1.rb in j7w1-0.0.7

@@ -1,11 +1,15 @@
 require 'yaml'
 
 module J7W1
-  autoload :Configuration, 'j7_w1/configuration'
-  autoload :Util, 'j7_w1/util'
+  autoload :Configuration, 'j7w1/configuration'
+  autoload :Util, 'j7w1/util'
+  autoload :Version, 'j7w1/version'
+  autoload :ActiveRecordExt, 'j7w1/active_record_ext'
 
+  ActiveRecord::Base.__send__(:include, ActiveRecordExt) if defined? ActiveRecord::Base
+
   class << self
     attr_reader :current_strategy
     private :current_strategy
 
     def configure(configuration)
@@ -13,15 +17,15 @@
         "J7W1 configuration values should be an instance of Hash or String, but actually it is a kind of #{configuration.class.name}" unless
       configuration.is_a?(Hash) || configuration.is_a?(String)
 
       configuration = configuration_values_of(configuration)
       if configuration[:mock]
-        require 'j7_w1/mock'
+        autoload :PushClient, 'j7w1/mock'
         return
       end
 
-      require 'j7_w1/concrete'
+      autoload :PushClient, 'j7w1/push_client'
       @configuration = Configuration.new configuration
     end
 
     def configuration
       @configuration
@@ -84,11 +88,6 @@
               value
         end
       end
     end
   end
-end
-
-if defined? ActiveRecord
-  require 'j7_w1/active_record_ext'
-  ActiveRecord::Base.__send__ :include, J7W1::ActiveRecordExt
 end