Refactored out class convenience methods

lib/mongo-lock.rb

@@ -1,9 +1,12 @@
 require 'mongo-lock/configuration'
 require 'mongo-lock/queries'
+require 'mongo-lock/class_convenience_methods'
 
 module Mongo
   class Lock
 
+    extend Mongo::Lock::ClassConvenienceMethods
+
     class NotAcquiredError < StandardError ; end
     class NotReleasedError < StandardError ; end
     class NotExtendedError < StandardError ; end
@@ -36,31 +39,6 @@ def self.configuration
       end
     end
 
-    def self.init_and_send key, options = {}, method
-      lock = self.new(key, options)
-      lock.send(method)
-      lock
-    end
-
-    def self.acquire key, options = {}
-      init_and_send key, options, :acquire
-    end
-
-    def self.release key, options = {}
-      init_and_send key, options, :release
-    end
-
-    def self.acquire! key, options = {}
-      init_and_send key, options, :acquire!
-    end
-
-    def self.release! key, options = {}
-      init_and_send key, options, :release!
-    end
-
-    def self.available? key, options = {}
-      init_and_send key, options, :available?
-    end
 
     def self.release_all options = {}
       if options.include? :collection

lib/mongo-lock/class_convenience_methods.rb

@@ -0,0 +1,33 @@
+module Mongo
+  class Lock
+    module ClassConvenienceMethods
+
+      def init_and_send key, options = {}, method
+        lock = Mongo::Lock.new(key, options)
+        lock.send(method)
+        lock
+      end
+
+      def acquire key, options = {}
+        init_and_send key, options, :acquire
+      end
+
+      def release key, options = {}
+        init_and_send key, options, :release
+      end
+
+      def acquire! key, options = {}
+        init_and_send key, options, :acquire!
+      end
+
+      def release! key, options = {}
+        init_and_send key, options, :release!
+      end
+
+      def available? key, options = {}
+        init_and_send key, options, :available?
+      end
+
+    end
+  end
+end