Compatibility refactoring/cleanup

Author: mperham

History.md

@@ -4,6 +4,7 @@ Dalli Changelog
 HEAD
 =======
 
+ - Compatibility fixes (mwynholds)
  - Add backwards compatibility module for memcache-client, require 'dalli/memcache-client'.  It makes
    Dalli more compatible with memcache-client and prints out a warning any time you do something that 
    is no longer supported so you can fix your code.

Upgrade.md

@@ -7,9 +7,12 @@ Dalli is not meant to be 100% compatible with memcache-client, there are a few m
 Compatibility Layer
 ----------------------
 
+Enable memcache-client compatibility in your application when upgrading by requiring this when
+initalizing your app:
+
     require 'dalli/memcache-client'
 
-Prints out warnings if your code is using the old memcache-client API style, explained below.
+This will print out warnings if your code is using the old memcache-client API style, explained below.
 
 
 Marshalling

lib/dalli.rb

@@ -4,7 +4,6 @@
 require 'dalli/socket'
 require 'dalli/version'
 require 'dalli/options'
-require 'dalli/memcache_client_compatibility'
 
 unless ''.respond_to?(:bytesize)
   class String

lib/dalli/client.rb

@@ -35,6 +35,7 @@ def self.compatibility_mode
     end
 
     def self.compatibility_mode=(compatibility_mode)
+      require 'dalli/compatibility'
       @compatibility_mode = compatibility_mode
     end